Skip to content

node-api: handle pending exception in callback wrapper #39476

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
mhdawson wants to merge 2 commits into from
+37 −2
Closed

node-api: handle pending exception in callback wrapper #39476

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77018ed
node-api: handle pending exception in cb wrapper
mhdawson Jul 21, 2021
569c542
squash: add test
mhdawson Jul 27, 2021
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
8 changes: 6 additions & 2 deletions src/js_native_api_v8.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,12 +306,16 @@ class CallbackWrapperBase : public CallbackWrapper {
napi_env env = _bundle->env;
napi_callback cb = _bundle->cb;

napi_value result;
napi_value result = nullptr;
bool exceptionOccurred = false;
env->CallIntoModule([&](napi_env env) {
result = cb(env, cbinfo_wrapper);
}, [&](napi_env env, v8::Local<v8::Value> value) {
exceptionOccurred = true;
env->isolate->ThrowException(value);
});

if (result != nullptr) {
if (!exceptionOccurred && (result != nullptr)) {
this->SetReturnValue(result);
}
}
Expand Down