Skip to content
This repository was archived by the owner on Apr 22, 2023. It is now read-only.

Commit 5106cad

Browse files
rmgtrevnorris
authored andcommitted
domain: fix off-by-one in Domain.exit()
We want to clear the found domain and the domains after it. Signed-off-by: Trevor Norris <[email protected]>
1 parent 2eddd74 commit 5106cad

File tree

2 files changed

+60
-1
lines changed

2 files changed

+60
-1
lines changed

lib/domain.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ Domain.prototype.exit = function() {
141141
// exit all domains until this one.
142142
var index = stack.lastIndexOf(this);
143143
if (index !== -1)
144-
stack.splice(index + 1);
144+
stack.splice(index);
145145
else
146146
stack.length = 0;
147147
_domain_flag[0] = stack.length;

test/simple/test-domain-enter-exit.js

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
// Copyright Joyent, Inc. and other Node contributors.
2+
//
3+
// Permission is hereby granted, free of charge, to any person obtaining a
4+
// copy of this software and associated documentation files (the
5+
// "Software"), to deal in the Software without restriction, including
6+
// without limitation the rights to use, copy, modify, merge, publish,
7+
// distribute, sublicense, and/or sell copies of the Software, and to permit
8+
// persons to whom the Software is furnished to do so, subject to the
9+
// following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included
12+
// in all copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
15+
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
17+
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
18+
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
19+
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
20+
// USE OR OTHER DEALINGS IN THE SOFTWARE.
21+
22+
23+
// Make sure the domain stack is a stack
24+
25+
var assert = require('assert');
26+
var domain = require('domain');
27+
28+
function names(array) {
29+
return array.map(function(d) {
30+
return d.name
31+
}).join(', ');
32+
}
33+
34+
var a = domain.create();
35+
a.name = 'a';
36+
var b = domain.create();
37+
b.name = 'b';
38+
var c = domain.create();
39+
c.name = 'c';
40+
41+
a.enter(); // push
42+
assert.deepEqual(domain._stack, [a],
43+
'a not pushed: ' + names(domain._stack));
44+
45+
b.enter(); // push
46+
assert.deepEqual(domain._stack, [a, b],
47+
'b not pushed: ' + names(domain._stack));
48+
49+
c.enter(); // push
50+
assert.deepEqual(domain._stack, [a, b, c],
51+
'c not pushed: ' + names(domain._stack));
52+
53+
b.exit(); // pop
54+
assert.deepEqual(domain._stack, [a],
55+
'b and c not popped: ' + names(domain._stack));
56+
57+
b.enter(); // push
58+
assert.deepEqual(domain._stack, [a, b],
59+
'b not pushed: ' + names(domain._stack));

0 commit comments

Comments
 (0)