timers: check can_call_into_js in Immediates #21057
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Do not execute native immediates and prevent infinite loop if it's possible to call into JS
apapirovski
added
c++
nodejs-github-bot
added
the
c++
addaleax
approved these changes
May 31, 2018
src/env.cc
Outdated
| @@ -457,7 +457,7 @@ void Environment::RunAndClearNativeImmediates() { | |||
| void Environment::CheckImmediate(uv_check_t* handle) { | |||
| Environment* env = Environment::from_immediate_check_handle(handle); | |||
|
|
|||
| if (env->immediate_info()->count() == 0) | |||
| if (env->immediate_info()->count() == 0 || !env->can_call_into_js()) | |||
There was a problem hiding this comment.
I think this should be right before the do {, because we probably want our native immediate callbacks to still be called – not all of them are calling JS, some or doing cleanup rather than something else
There was a problem hiding this comment.
Would that be strictly correct even if it's not calling JS? At least in relation to the main thread (and not workers), the expectation was that no user code would run after EmitExit finishes. After RunCleanup was added that's no longer the case since we run the loop one final time.
Are there are any Immediates that we truly want to have run at this point?
jasnell
approved these changes
May 31, 2018
BridgeAR
added
the
author ready
Fishrock123
approved these changes
Jun 2, 2018
|
Landed in 5a6b197 |
apapirovski
added a commit
that referenced
this pull request
Jun 4, 2018
Prevent an infinite loop if it's not possible to call into JS. PR-URL: #21057 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
MylesBorins
pushed a commit
that referenced
this pull request
Jun 6, 2018
Prevent an infinite loop if it's not possible to call into JS. PR-URL: #21057 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Do not call into JS if it's not safe in Immediates and prevent a future infinite loop.
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passes