From 14c911de77ae377ec777d6f1a59d0de904ec5ae7 Mon Sep 17 00:00:00 2001
From: Dave Olszewski <cxreg@pobox.com>
Date: Thu, 27 Dec 2012 12:08:23 -0800
Subject: [PATCH] domain: empty stack on all exceptions

Due to the nature of asyncronous programming, it's impossible to know
what will run on the next tick.  Because of this, it's not correct to
maintain domain stack state between ticks

Since the _fatalException handler is only invoked after the stack is
unwound, once it exits the tick will end.  The only reasonable thing to
do in that case is to exit *all* domains.
---
 src/node.js                       |  9 ++++++-
 test/simple/test-domain-nested.js | 42 +++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 test/simple/test-domain-nested.js

diff --git a/src/node.js b/src/node.js
index d24387ce5f5..f86a9504262 100644
--- a/src/node.js
+++ b/src/node.js
@@ -243,7 +243,14 @@
           // If caught is false after this, then there's no need to exit()
           // the domain, because we're going to crash the process anyway.
           caught = domain.emit('error', er);
-          domain.exit();
+
+          // 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.
+          var domainModule = NativeModule.require('domain');
+          domainModule._stack.length = 0;
+          domainModule.active = process.domain = null;
         } catch (er2) {
           caught = false;
         }
diff --git a/test/simple/test-domain-nested.js b/test/simple/test-domain-nested.js
new file mode 100644
index 00000000000..efd672b25f9
--- /dev/null
+++ b/test/simple/test-domain-nested.js
@@ -0,0 +1,42 @@
+// 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.
+
+
+// Make sure that the nested domains don't cause the domain stack to grow
+
+var assert = require('assert');
+var domain = require('domain');
+
+process.on('exit', function(c) {
+  assert.equal(domain._stack.length, 0);
+});
+
+domain.create().run(function() {
+  domain.create().run(function() {
+    domain.create().run(function() {
+      domain.create().on("error", function(e) {
+          // Don't need to do anything here
+      }).run(function() {
+        throw new Error("died")
+      })
+    })
+  })
+})