src: harden running native SetImmediate()s slightly

Prevent mistakes like the one fixed by the previous commit by destroying the callback immediately after it has been called. Backport-PR-URL: #32301 PR-URL: #31468 Refs: #31386 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Gireesh Punathil <[email protected]>
nodejs · Apr 1, 2020 · 56a4509 · 56a4509
1 parent c5de212
commit 56a4509
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/env.cc b/src/env.cc
@@ -698,6 +698,8 @@ void Environment::RunAndClearNativeImmediates(bool only_refed) {
       if (head->is_refed() || !only_refed)
         head->Call(this);
 
+      head.reset();  // Destroy now so that this is also observed by try_catch.
+
       if (UNLIKELY(try_catch.HasCaught())) {
         if (!try_catch.HasTerminated() && can_call_into_js())
           errors::TriggerUncaughtException(isolate(), try_catch);