timers: fix arbitrary object clearImmediate errors

Fix errors that are caused by invoking clearImmediate with arbitrary objects. fixes: #37806
nodejs · Mar 20, 2021 · f0f059f · f0f059f
1 parent d3417bb
commit f0f059f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/internal/timers.js b/lib/internal/timers.js
@@ -279,11 +279,11 @@ ImmediateList.prototype.append = function(item) {
 // Removes an item from the linked list, adjusting the pointers of adjacent
 // items and the linked list's head or tail pointers as necessary
 ImmediateList.prototype.remove = function(item) {
-  if (item._idleNext !== null) {
+  if (item._idleNext) {
     item._idleNext._idlePrev = item._idlePrev;
   }
 
-  if (item._idlePrev !== null) {
+  if (item._idlePrev) {
     item._idlePrev._idleNext = item._idleNext;
   }
 

diff --git a/lib/timers.js b/lib/timers.js
@@ -283,7 +283,7 @@ function clearImmediate(immediate) {
     toggleImmediateRef(false);
   immediate[kRefed] = null;
 
-  if (destroyHooksExist()) {
+  if (destroyHooksExist() && immediate[async_id_symbol] !== undefined) {
     emitDestroy(immediate[async_id_symbol]);
   }