Skip to content

Commit

Permalink
src: fix off-by-one error in native SetImmediate
Browse files Browse the repository at this point in the history
Previously, the throwing callback would have been re-executed in case
of an exception. This patch corrects the calculation to exclude the
callback.
  • Loading branch information
addaleax committed Jun 5, 2019
1 parent cb68c04 commit 24a1905
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions src/env.cc
Expand Up @@ -641,6 +641,11 @@ void Environment::RunAndClearNativeImmediates() {
if (!try_catch.HasTerminated())
FatalException(isolate(), try_catch);

// We are done with the current callback. Increase the counter so that
// the steps below make everything *after* the current item part of
// the new list.
it++;

// Bail out, remove the already executed callbacks from list
// and set up a new TryCatch for the other pending callbacks.
std::move_backward(it, list.end(), list.begin() + (list.end() - it));
Expand Down

0 comments on commit 24a1905

Please sign in to comment.