Skip to content

objectwrap: gracefully handle constructor exceptions #600

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

Closed
gabrielschulhof wants to merge 4 commits into from
Closed

objectwrap: gracefully handle constructor exceptions #600

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8cf3755
objectwrap: gracefully handle constructor exceptions
Nov 14, 2019
b00638c
remove static cast in constructor
Jan 1, 2020
868b4bd
perform some renames to better reflect semantics
Jan 2, 2020
bd465de
test for a specific exception
Jan 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove static cast in constructor
  • Loading branch information
Gabriel Schulhof committed Jan 7, 2020
commit b00638cf428cd6dd0bea7a4076cb98d3c25e3452
7 changes: 3 additions & 4 deletions napi-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3137,12 +3137,11 @@ inline ObjectWrap<T>::ObjectWrap(const Napi::CallbackInfo& callbackInfo) {
napi_value wrapper = callbackInfo.This();
napi_status status;
napi_ref ref;
T* instance = static_cast<T*>(this);
Copy link
Copy Markdown
Contributor Author

@gabrielschulhof gabrielschulhof Jan 1, 2020

Choose a reason for hiding this comment

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

@dmitryash it's actually possible to avoid this cast, because this works just fine in the code below.

Copy link
Copy Markdown
Member

@addaleax addaleax Jan 14, 2020

Choose a reason for hiding this comment

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

@gabrielschulhof While I agree that this is nicer this way, it also requires updating the cast in FinalizeCallback like #475 does

Copy link
Copy Markdown
Contributor Author

@gabrielschulhof gabrielschulhof Jan 15, 2020

Choose a reason for hiding this comment

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

@addaleax I think #475 will mostly supersede this PR.

status = napi_wrap(env, wrapper, instance, FinalizeCallback, nullptr, &ref);
status = napi_wrap(env, wrapper, this, FinalizeCallback, nullptr, &ref);
NAPI_THROW_IF_FAILED_VOID(env, status);

ObjectWrapCleanup::MarkWrapOK(callbackInfo);
Reference<Object>* instanceRef = instance;
Reference<Object>* instanceRef = this;
*instanceRef = Reference<Object>(env, ref);
}

Expand Down Expand Up @@ -3722,7 +3721,7 @@ inline napi_value ObjectWrap<T>::ConstructorCallbackWrapper(
try {
new T(callbackInfo);
} catch (const Error& e) {
// re-throw the error after removing the failed wrap.
// Re-throw the error after removing the failed wrap.
cleanup.RemoveWrap(callbackInfo);
throw e;
}
Expand Down