diff options
| -rw-r--r-- | lib/domain.js | 10 | ||||
| -rw-r--r-- | test/simple/test-domain-safe-exit.js | 36 |
2 files changed, 41 insertions, 5 deletions
diff --git a/lib/domain.js b/lib/domain.js index 80a64c64bf..afaa922ebe 100644 --- a/lib/domain.js +++ b/lib/domain.js @@ -67,13 +67,13 @@ Domain.prototype.enter = function() { }; Domain.prototype.exit = function() { - if (this._disposed) return; + // skip disposed domains, as usual, but also don't do anything if this + // domain is not on the stack. + var index = stack.lastIndexOf(this); + if (this._disposed || index === -1) return; // exit all domains until this one. - var d; - do { - d = stack.pop(); - } while (d && d !== this); + stack.splice(index); exports.active = stack[stack.length - 1]; process.domain = exports.active; diff --git a/test/simple/test-domain-safe-exit.js b/test/simple/test-domain-safe-exit.js new file mode 100644 index 0000000000..a7dcef078b --- /dev/null +++ b/test/simple/test-domain-safe-exit.js @@ -0,0 +1,36 @@ +// 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 the domain stack doesn't get clobbered by un-matched .exit() + +var assert = require('assert'); +var domain = require('domain'); + +var a = domain.create(); +var b = domain.create(); + +a.enter(); // push +b.enter(); // push +assert.deepEqual(domain._stack, [a, b], 'b not pushed'); + +domain.create().exit(); // no-op +assert.deepEqual(domain._stack, [a, b], 'stack mangled!'); |