src: harden JSStream callbacks #18028
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
Since these are executing JS code, and in particular parts of that code may be provided by userland, handle such exceptions in C++. Ref: nodejs#17938 (comment)
nodejs-github-bot
added
the
c++
bnoordhuis
reviewed
Jan 7, 2018
| TryCatch try_catch(env()->isolate()); | ||
| Local<Value> value; | ||
| if (!MakeCallback(env()->isclosing_string(), 0, nullptr).ToLocal(&value)) { | ||
| FatalException(env()->isolate(), try_catch); |
There was a problem hiding this comment.
FatalException() can return so this should probably be followed by an ABORT() or something. The unguarded value->IsTrue() below is not safe, at any rate.
There was a problem hiding this comment.
@bnoordhuis Yea, thanks. 👍 I’ve added an extra return true; here and UV_EPROTO as the default return value for the other places, that’s what tls_wrap.cc uses as a generic failure code (but feel free to let me know of a better choice) – it shouldn’t make any difference in practice, I guess.
bnoordhuis
approved these changes
Jan 7, 2018
cjihrig
approved these changes
Jan 8, 2018
jasnell
approved these changes
Jan 8, 2018
danbev
approved these changes
Jan 9, 2018
|
CI failures are all infrastructure failures … Windows is pretty bad but I’d still go ahead with landing this, this isn’t too platform-specific code and it at least does compile successfully there. |
TimothyGu
approved these changes
Jan 11, 2018
|
Landed in 36daf1d |
addaleax
added a commit
that referenced
this pull request
Jan 14, 2018
Since these are executing JS code, and in particular parts of that code may be provided by userland, handle such exceptions in C++. Refs: #17938 (comment) PR-URL: #18028 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
evanlucas
pushed a commit
that referenced
this pull request
Jan 30, 2018
Since these are executing JS code, and in particular parts of that code may be provided by userland, handle such exceptions in C++. Refs: #17938 (comment) PR-URL: #18028 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
|
This seems like something we would want to backport, but perhaps wait a bit of time for it to harden. Thoughts? |
|
@addaleax I've backported to 8.x, please lmk if this should be backed out |
MylesBorins
pushed a commit
that referenced
this pull request
May 22, 2018
Since these are executing JS code, and in particular parts of that code may be provided by userland, handle such exceptions in C++. Refs: #17938 (comment) PR-URL: #18028 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
MylesBorins
pushed a commit
that referenced
this pull request
Jun 14, 2018
Since these are executing JS code, and in particular parts of that code may be provided by userland, handle such exceptions in C++. Refs: #17938 (comment) PR-URL: #18028 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
Merged
rvagg
pushed a commit
that referenced
this pull request
Aug 16, 2018
Since these are executing JS code, and in particular parts of that code may be provided by userland, handle such exceptions in C++. Refs: #17938 (comment) PR-URL: #18028 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
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.
Since these are executing JS code, and in particular parts of that
code may be provided by userland, handle such exceptions in C++.
Ref: #17938 (comment) (/cc @jasnell)
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesAffected core subsystem(s)
src/js_stream.cc