Skip to content

Commit b221fe9

Browse files
committed
timers: add v0.4 compatibility hack
If a timer callback throws and the user's uncaughtException handler ignores the exception, other timers that expire on the current tick should still run. If #2582 goes through, this hack should be removed. Fixes #2631.
1 parent ca4b91a commit b221fe9

2 files changed

Lines changed: 67 additions & 1 deletion

File tree

lib/timers.js

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,21 @@ function insert(item, msecs) {
8181
} else {
8282
L.remove(first);
8383
assert(first !== L.peek(list));
84-
if (first._onTimeout) first._onTimeout();
84+
85+
if (!first._onTimeout) continue;
86+
87+
// v0.4 compatibility: if the timer callback throws and the user's
88+
// uncaughtException handler ignores the exception, other timers that
89+
// expire on this tick should still run. If #2582 goes through, this
90+
// hack should be removed.
91+
//
92+
// https://github.com/joyent/node/issues/2631
93+
try {
94+
first._onTimeout();
95+
} catch (e) {
96+
if (!process.listeners('uncaughtException').length) throw e;
97+
process.emit('uncaughtException', e);
98+
}
8599
}
86100
}
87101

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
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+
var common = require('../common');
23+
var assert = require('assert');
24+
25+
var exceptions = 0;
26+
var timer1 = 0;
27+
var timer2 = 0;
28+
29+
// the first timer throws...
30+
setTimeout(function() {
31+
timer1++;
32+
throw new Error('BAM!');
33+
}, 100);
34+
35+
// ...but the second one should still run
36+
setTimeout(function() {
37+
assert.equal(timer1, 1);
38+
timer2++;
39+
}, 100);
40+
41+
function uncaughtException(err) {
42+
assert.equal(err.message, 'BAM!');
43+
exceptions++;
44+
}
45+
process.on('uncaughtException', uncaughtException);
46+
47+
process.on('exit', function() {
48+
process.removeListener('uncaughtException', uncaughtException);
49+
assert.equal(exceptions, 1);
50+
assert.equal(timer1, 1);
51+
assert.equal(timer2, 1);
52+
});

0 commit comments

Comments
 (0)