diff options
| author | Anna Henningsen <anna@addaleax.net> | 2018-05-18 16:59:37 +0200 |
|---|---|---|
| committer | Anatoli Papirovski <apapirovski@mac.com> | 2018-05-31 11:53:30 +0200 |
| commit | 694ac6de5ba2591c8d3d56017b2423bd3e39f769 (patch) | |
| tree | 169ce1c5aa7103fd9434d46e02e1de0d25925130 /src | |
| parent | c1012b440203b2ab42b350b0300eb3bc8ec36381 (diff) | |
| download | android-node-v8-694ac6de5ba2591c8d3d56017b2423bd3e39f769.tar.gz android-node-v8-694ac6de5ba2591c8d3d56017b2423bd3e39f769.tar.bz2 android-node-v8-694ac6de5ba2591c8d3d56017b2423bd3e39f769.zip | |
src: break out of timers loop if `!can_call_into_js()`
Otherwise, this turns into an infinite loop when the flag
is set, because it makes `MakeCallback()` return immediately.
PR-URL: https://github.com/nodejs/node/pull/20884
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Diffstat (limited to 'src')
| -rw-r--r-- | src/timer_wrap.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/timer_wrap.cc b/src/timer_wrap.cc index 1a5a22c25e..b87430dad8 100644 --- a/src/timer_wrap.cc +++ b/src/timer_wrap.cc @@ -134,7 +134,9 @@ class TimerWrap : public HandleWrap { do { ret = wrap->MakeCallback(env->timers_callback_function(), 1, args) .ToLocalChecked(); - } while (ret->IsUndefined() && !env->tick_info()->has_thrown()); + } while (ret->IsUndefined() && + !env->tick_info()->has_thrown() && + env->can_call_into_js()); } static void Now(const FunctionCallbackInfo<Value>& args) { |