From 9fa25c8ca0158fec7526c7b8b3db74d2bc66fb73 Mon Sep 17 00:00:00 2001 From: Kyle Simpson Date: Sat, 22 Aug 2015 13:46:36 -0500 Subject: [PATCH] timers: fixing API refs to use safe internal refs Added safe internal references for 'clearTimeout(..)', 'active(..)', and 'unenroll(..)'. Changed various API refs from 'export.*' to use these safe internal references. Now, overwriting the global API identifiers does not create potential breakage and/or race conditions. See Issue #2493. PR-URL: https://github.com/nodejs/node/pull/5882 Reviewed-By: James M Snell Reviewed-By: Jeremiah Senkpiel Fixes: https://github.com/nodejs/node/issues/2493 --- lib/timers.js | 16 ++++++++-------- test/parallel/test-timers-api-refs.js | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 test/parallel/test-timers-api-refs.js diff --git a/lib/timers.js b/lib/timers.js index 478a054339..dc2506e01e 100644 --- a/lib/timers.js +++ b/lib/timers.js @@ -100,7 +100,7 @@ const unrefedLists = {}; // Schedule or re-schedule a timer. // The item must have been enroll()'d first. -exports.active = function(item) { +const active = exports.active = function(item) { insert(item, false); }; @@ -351,19 +351,19 @@ exports.setTimeout = function(callback, after) { if (process.domain) timer.domain = process.domain; - exports.active(timer); + active(timer); return timer; }; -exports.clearTimeout = function(timer) { +const clearTimeout = exports.clearTimeout = function(timer) { if (timer && (timer[kOnTimeout] || timer._onTimeout)) { timer[kOnTimeout] = timer._onTimeout = null; if (timer instanceof Timeout) { timer.close(); // for after === 0 } else { - exports.unenroll(timer); + unenroll(timer); } } }; @@ -409,7 +409,7 @@ exports.setInterval = function(callback, repeat) { timer._repeat = ontimeout; if (process.domain) timer.domain = process.domain; - exports.active(timer); + active(timer); return timer; @@ -425,7 +425,7 @@ exports.setInterval = function(callback, repeat) { this._handle.start(repeat, 0); } else { timer._idleTimeout = repeat; - exports.active(timer); + active(timer); } } }; @@ -468,7 +468,7 @@ Timeout.prototype.unref = function() { // Prevent running cb again when unref() is called during the same cb if (this._called && !this._repeat) { - exports.unenroll(this); + unenroll(this); return; } @@ -496,7 +496,7 @@ Timeout.prototype.close = function() { this._handle[kOnTimeout] = null; this._handle.close(); } else { - exports.unenroll(this); + unenroll(this); } return this; }; diff --git a/test/parallel/test-timers-api-refs.js b/test/parallel/test-timers-api-refs.js new file mode 100644 index 0000000000..00d1c1355f --- /dev/null +++ b/test/parallel/test-timers-api-refs.js @@ -0,0 +1,20 @@ +'use strict'; +const common = require('../common'); +const assert = require('assert'); + +// don't verify the globals for this test +common.globalCheck = false; + +// try overriding global APIs to make sure +// they're not relied on by the timers +global.clearTimeout = assert.fail; + +// run timeouts/intervals through the paces +const intv = setInterval(function() {}, 1); + +setTimeout(function() { + clearInterval(intv); +}, 100); + +setTimeout(function() {}, 2); +