Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

src,http: fix uncaughtException miss in http #5591

Merged
merged 1 commit into from
Mar 8, 2016
Merged

src,http: fix uncaughtException miss in http #5591

merged 1 commit into from
Mar 8, 2016

Conversation

trevnorris
Copy link
Contributor

In AsyncWrap::MakeCallback always return empty handle if there is an
error. In the future this should change to return a v8::MaybeLocal, but
that major change will have to wait for v6.x, and these changes are
meant to be backported to v4.x.

The HTTParser call to AsyncWrap::MakeCallback failed because it expected
a thrown call to return an empty handle.

In node::MakeCallback return an empty handle if the call is
in_makecallback(), otherwise return v8::Undefined() as usual to preserve
backwards compatibility.

Follow up from #5571 where was decided patch would land on master first.

R=@misterdjules
R=@indutny
R=@thealphanerd

CI: https://ci.nodejs.org/job/node-test-pull-request/1876/

@trevnorris trevnorris added http Issues or PRs related to the http subsystem. c++ Issues and PRs that require attention from people who are familiar with C++. labels Mar 7, 2016
@trevnorris trevnorris mentioned this pull request Mar 7, 2016
Merged
@trevnorris trevnorris force-pushed the retro-trycatch-mc branch 3 times, most recently from b7025ca to e6eac8a Compare March 7, 2016 21:40
@MylesBorins
Copy link
Contributor

/cc @nodejs/ctc @nodejs/collaborators if anyone feels up for it please do a code review!

@misterdjules misterdjules mentioned this pull request Mar 7, 2016
Closed
4 tasks
misterdjules
misterdjules reviewed Mar 7, 2016
View reviewed changes
src/node.cc
@@ -1198,7 +1198,10 @@ Local<Value> MakeCallback(Environment* env,
}

if (ret.IsEmpty()) {
return Undefined(env->isolate());
if (callback_scope.in_makecallback())
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be useful to add a comment here mentioning that undefined is returned here for backward compatibility?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can do.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done, just below.

@Fishrock123 Fishrock123 added this to the 5.7.2 milestone Mar 7, 2016
@misterdjules
Copy link

@trevnorris Do we want to handle both cases (being in a recursive node::MakeCallback call or not) for https://github.com/nodejs/node/blob/master/src/node.cc#L1215 and https://github.com/nodejs/node/blob/master/src/node.cc#L1174 too?

@trevnorris
Copy link
Contributor Author

@misterdjules TBH I'm more concerned about making sure everything is backward compatible w/ v4. After async wrap is backported and public i'll go through and make those APIs return MaybeLocals instead and have them always return an empty handle.

@misterdjules
Copy link

@trevnorris

TBH I'm more concerned about making sure everything is backward compatible w/ v4. After async wrap is backported and public i'll go through and make those APIs return MaybeLocals instead and have them always return an empty handle.

Sounds good!

Another case I missed to mention is https://github.com/nodejs/node/blob/master/src/async-wrap.cc#L196. I don't have the time to create a repro for that use case, but I'd imagine it would be possible to write one that exposes a problem where a callback executed by node::Parser would run in a domain that was disposed, and the parser would consider that there was no error when executing that callback.

What do you think?

@trevnorris
Copy link
Contributor Author

@misterdjules AsyncWrap::MakeCallback is completely internal. I'll change that case.

@trevnorris
Copy link
Contributor Author

Everything's fixed up. Just need the sign-off.

@misterdjules
Copy link

@trevnorris LGTM. Thank you!

@trevnorris
src,http: fix uncaughtException miss in http
3521b05 
In AsyncWrap::MakeCallback always return empty handle if there is an
error. In the future this should change to return a v8::MaybeLocal, but
that major change will have to wait for v6.x, and these changes are
meant to be backported to v4.x.

The HTTParser call to AsyncWrap::MakeCallback failed because it expected
a thrown call to return an empty handle.

In node::MakeCallback return an empty handle if the call is
in_makecallback(), otherwise return v8::Undefined() as usual to preserve
backwards compatibility.

Fixes: nodejs#5555
PR-URL: nodejs#5591
Reviewed-By: Julien Gilli <jgilli@nodejs.org>
@trevnorris
Copy link
Contributor Author

Thanks much! Landed in 3521b05.

@trevnorris trevnorris closed this Mar 8, 2016
@trevnorris trevnorris merged commit 3521b05 into nodejs:master Mar 8, 2016
@trevnorris trevnorris deleted the retro-trycatch-mc branch March 8, 2016 17:47
Fishrock123 pushed a commit that referenced this pull request Mar 8, 2016
@trevnorris @Fishrock123
src,http: fix uncaughtException miss in http
42fba0a 
In AsyncWrap::MakeCallback always return empty handle if there is an
error. In the future this should change to return a v8::MaybeLocal, but
that major change will have to wait for v6.x, and these changes are
meant to be backported to v4.x.

The HTTParser call to AsyncWrap::MakeCallback failed because it expected
a thrown call to return an empty handle.

In node::MakeCallback return an empty handle if the call is
in_makecallback(), otherwise return v8::Undefined() as usual to preserve
backwards compatibility.

Fixes: #5555
PR-URL: #5591
Reviewed-By: Julien Gilli <jgilli@nodejs.org>
Fishrock123 pushed a commit that referenced this pull request Mar 8, 2016
@trevnorris @Fishrock123
src,http: fix uncaughtException miss in http
5e6d706 
In AsyncWrap::MakeCallback always return empty handle if there is an
error. In the future this should change to return a v8::MaybeLocal, but
that major change will have to wait for v6.x, and these changes are
meant to be backported to v4.x.

The HTTParser call to AsyncWrap::MakeCallback failed because it expected
a thrown call to return an empty handle.

In node::MakeCallback return an empty handle if the call is
in_makecallback(), otherwise return v8::Undefined() as usual to preserve
backwards compatibility.

Fixes: #5555
PR-URL: #5591
Reviewed-By: Julien Gilli <jgilli@nodejs.org>
Fishrock123 added a commit that referenced this pull request Mar 8, 2016
@Fishrock123
2016-03-08, Version 5.8.0 (Stable)
fc13773 
Notable changes:

* child_process: “send()” now accepts an options parameter (cjihrig)
#5283
  - Currently the only option is “keepOpen”, which keeps the underlying
socket open after the message is sent.
* constants: “ENGINE_METHOD_RSA” is now correctly exposed (Sam Roberts)
#5463
* Fixed two regressions which originated in v5.7.0:
  - http: Errors inside of http client callbacks now propagate
correctly (Trevor Norris) #5591
  - path: Fixed normalization of absolute paths (Evan Lucas)
#5589
* repl: “start()” no longer requires an options parameter (cjihrig)
#5388
* util: Improved “format()” performance 50-300% (Evan Lucas)
#5360

PR-URL: #5559
Fishrock123 added a commit to Fishrock123/node that referenced this pull request Mar 9, 2016
@Fishrock123
2016-03-08, Version 5.8.0 (Stable)
3c84752 
Notable changes:

* child_process: “send()” now accepts an options parameter (cjihrig)
nodejs#5283
- Currently the only option is “keepOpen”, which keeps the underlying
socket open after the message is sent.
* constants: “ENGINE_METHOD_RSA” is now correctly exposed (Sam Roberts)
nodejs#5463
* Fixed two regressions which originated in v5.7.0:
  - http: Errors inside of http client callbacks now propagate
correctly (Trevor Norris) nodejs#5591
  - path: Fixed normalization of absolute paths (Evan Lucas)
nodejs#5589
* repl: “start()” no longer requires an options parameter (cjihrig)
nodejs#5388
* util: Improved “format()” performance 50-300% (Evan Lucas)
nodejs#5360

PR-URL: nodejs#5559
@MylesBorins MylesBorins mentioned this pull request Mar 10, 2016
Closed
@MylesBorins
Copy link
Contributor

adding don't land as we are not backporting the other change.

edit: the other change is under lts-watch, and now so is this

@MylesBorins MylesBorins mentioned this pull request Mar 10, 2016
Closed
This was referenced May 29, 2016
Closed
Closed
MylesBorins pushed a commit that referenced this pull request Jun 7, 2016
@trevnorris
src,http: fix uncaughtException miss in http
7658be3 
In AsyncWrap::MakeCallback always return empty handle if there is an
error. In the future this should change to return a v8::MaybeLocal, but
that major change will have to wait for v6.x, and these changes are
meant to be backported to v4.x.

The HTTParser call to AsyncWrap::MakeCallback failed because it expected
a thrown call to return an empty handle.

In node::MakeCallback return an empty handle if the call is
in_makecallback(), otherwise return v8::Undefined() as usual to preserve
backwards compatibility.

Ref: #7048
Fixes: #5555
PR-URL: #5591
Reviewed-By: Julien Gilli <jgilli@nodejs.org>
MylesBorins pushed a commit that referenced this pull request Jun 24, 2016
@trevnorris
src,http: fix uncaughtException miss in http
76cea4f 
In AsyncWrap::MakeCallback always return empty handle if there is an
error. In the future this should change to return a v8::MaybeLocal, but
that major change will have to wait for v6.x, and these changes are
meant to be backported to v4.x.

The HTTParser call to AsyncWrap::MakeCallback failed because it expected
a thrown call to return an empty handle.

In node::MakeCallback return an empty handle if the call is
in_makecallback(), otherwise return v8::Undefined() as usual to preserve
backwards compatibility.

Ref: #7048
Fixes: #5555
PR-URL: #5591
Reviewed-By: Julien Gilli <jgilli@nodejs.org>
MylesBorins pushed a commit that referenced this pull request Jun 28, 2016
@trevnorris
src,http: fix uncaughtException miss in http
534e199 
In AsyncWrap::MakeCallback always return empty handle if there is an
error. In the future this should change to return a v8::MaybeLocal, but
that major change will have to wait for v6.x, and these changes are
meant to be backported to v4.x.

The HTTParser call to AsyncWrap::MakeCallback failed because it expected
a thrown call to return an empty handle.

In node::MakeCallback return an empty handle if the call is
in_makecallback(), otherwise return v8::Undefined() as usual to preserve
backwards compatibility.

Ref: #7048
Fixes: #5555
PR-URL: #5591
Reviewed-By: Julien Gilli <jgilli@nodejs.org>
MylesBorins pushed a commit that referenced this pull request Jul 12, 2016
@trevnorris
src,http: fix uncaughtException miss in http
63356df 
In AsyncWrap::MakeCallback always return empty handle if there is an
error. In the future this should change to return a v8::MaybeLocal, but
that major change will have to wait for v6.x, and these changes are
meant to be backported to v4.x.

The HTTParser call to AsyncWrap::MakeCallback failed because it expected
a thrown call to return an empty handle.

In node::MakeCallback return an empty handle if the call is
in_makecallback(), otherwise return v8::Undefined() as usual to preserve
backwards compatibility.

Ref: #7048
Fixes: #5555
PR-URL: #5591
Reviewed-By: Julien Gilli <jgilli@nodejs.org>
@MylesBorins MylesBorins mentioned this pull request Jul 12, 2016
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
c++ Issues and PRs that require attention from people who are familiar with C++. http Issues or PRs related to the http subsystem.
Projects
None yet
Milestone
5.7.2
Development

Successfully merging this pull request may close these issues.
4 participants
@trevnorris @MylesBorins @misterdjules @Fishrock123