Permalink
Browse files

domain: Fix stack leak on error

  • Loading branch information...
1 parent f340ab7 commit a0ad365ddcb0d17b501f1825712df5706a945d3a @isaacs committed Jul 16, 2012
Showing with 48 additions and 0 deletions.
  1. +2 −0 lib/domain.js
  2. +46 −0 test/simple/test-domain-stack.js
View
@@ -41,6 +41,7 @@ exports.create = exports.createDomain = function(cb) {
// it's possible to enter one domain while already inside
// another one. the stack is each entered domain.
var stack = [];
+exports.stack = stack;
// the active domain is always the one that we're currently in.
exports.active = null;
@@ -58,6 +59,7 @@ function uncaughtHandler(er) {
domain_thrown: true
});
exports.active.emit('error', er);
+ exports.active.exit();
} else if (process.listeners('uncaughtException').length === 1) {
// if there are other handlers, then they'll take care of it.
// but if not, then we need to crash now.
@@ -0,0 +1,46 @@
+// 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 domain stack doesn't get out of hand.
+
+var common = require('../common');
+var assert = require('assert');
+var domain = require('domain');
+var events = require('events');
+
+var a = domain.create();
+
+a.on('error', function() {
+ console.error('error', domain.stack.length);
+ if (domain.stack.length > 5) {
+ console.trace('leaking!');
+ process.exit(1);
+ }
+});
+
+var foo = a.bind(function() {
+ throw new Error('error from foo');
+});
+
+for (var i = 0; i < 1000; i++) {
+ process.nextTick(foo);
+}

0 comments on commit a0ad365

Please sign in to comment.