domains: Handle errors thrown in nested error handlers

If a domain error handler throws, it should be caught if it was
in a stack of nested domains.

Fix #4953

diff --git a/src/node.js b/src/node.js
index e37fda2..a6ec671 100644 (file)
--- a/src/node.js
+++ b/src/node.js
@@ -223,6 +223,8 @@
       var caught = false;
       if (process.domain) {
         var domain = process.domain;
+        var domainModule = NativeModule.require('domain');
+        var domainStack = domainModule._stack;
 
         // ignore errors on disposed domains.
         //
@@ -247,14 +249,22 @@
           caught = domain.emit('error', er);
 
           // Exit all domains on the stack.  Uncaught exceptions end the
-          // current tick and no domains should be left on the stack between
-          // ticks.  Since a domain exists, this require will not be loading
-          // it for the first time and should be safe.
+          // current tick and no domains should be left on the stack
+          // between ticks.
           var domainModule = NativeModule.require('domain');
-          domainModule._stack.length = 0;
+          domainStack.length = 0;
           domainModule.active = process.domain = null;
         } catch (er2) {
-          caught = false;
+          // The domain error handler threw!  oh no!
+          // See if another domain can catch THIS error,
+          // or else crash on the original one.
+          domainStack.pop();
+          if (domainStack.length) {
+            var parentDomain = domainStack[ domainStack.length - 1];
+            process.domain = domainModule.active = parentDomain;
+            caught = process._fatalException(er2);
+          } else
+            caught = false;
         }
       } else {
         caught = process.emit('uncaughtException', er);

diff --git a/test/simple/test-domain-nested-throw.js b/test/simple/test-domain-nested-throw.js
new file mode 100644 (file)
index 0000000..e1d3bb2
--- /dev/null
+++ b/test/simple/test-domain-nested-throw.js
@@ -0,0 +1,79 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var common = require('../common');
+var assert = require('assert');
+
+var domain = require('domain');
+
+var gotDomain1Error = false;
+var gotDomain2Error = false;
+
+var threw1 = false;
+var threw2 = false;
+
+function throw1() {
+  threw1 = true;
+  throw new Error('handled by domain1');
+}
+
+function throw2() {
+  threw2 = true;
+  throw new Error('handled by domain2');
+}
+
+function inner(throw1, throw2) {
+  var domain1 = domain.createDomain();
+
+  domain1.on('error', function (err) {
+    console.error('domain 1 error');
+    if (gotDomain1Error) process.exit(1);
+    gotDomain1Error = true;
+    throw2();
+  });
+
+  domain1.run(function () {
+    throw1();
+  });
+}
+
+function outer() {
+  var domain2 = domain.createDomain();
+
+  domain2.on('error', function (err) {
+    console.error('domain 2 error');
+    gotDomain2Error = true;
+  });
+
+  domain2.run(function () {
+    inner(throw1, throw2);
+  });
+}
+
+process.on('exit', function() {
+  assert(gotDomain1Error);
+  assert(gotDomain2Error);
+  assert(threw1);
+  assert(threw2);
+  console.log('ok');
+});
+
+outer();