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.

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

v12.22.12 proposal #42531

Merged
merged 15 commits into from
Apr 5, 2022
Merged
Changes from 1 commit
Commits
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
node-api: fix shutdown crashes
Refs: nodejs/node-addon-api#906

Ensure that finalization is not defered during shutdown.
The env for the addon is deleted immediately after
iterating the list of finalizers to be run. Defering
causes crashes as the finalization uses the already
deleted env.

Signed-off-by: Michael Dawson <mdawson@devrus.com>

PR-URL: #38492
Backport-PR-URL: #42512
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
Reviewed-By: Gabriel Schulhof <gabrielschulhof@gmail.com>
mhdawson authored and richardlau committed Mar 30, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit a7224c9559519c830d751766b4d874b21f896fa9
31 changes: 31 additions & 0 deletions src/js_native_api_v8.h
Original file line number Diff line number Diff line change
@@ -122,6 +122,37 @@ struct napi_env__ {
void* instance_data = nullptr;
};

// This class is used to keep a napi_env live in a way that
// is exception safe versus calling Ref/Unref directly
class EnvRefHolder {
public:
explicit EnvRefHolder(napi_env env) : _env(env) {
_env->Ref();
}

explicit EnvRefHolder(const EnvRefHolder& other): _env(other.env()) {
_env->Ref();
}

EnvRefHolder(EnvRefHolder&& other) {
_env = other._env;
other._env = nullptr;
}

~EnvRefHolder() {
if (_env != nullptr) {
_env->Unref();
}
}

napi_env env(void) const {
return _env;
}

private:
napi_env _env;
};

static inline napi_status napi_clear_last_error(napi_env env) {
env->last_error.error_code = napi_ok;

9 changes: 7 additions & 2 deletions src/node_api.cc
Original file line number Diff line number Diff line change
@@ -35,8 +35,13 @@ struct node_napi_env__ : public napi_env__ {
}

void CallFinalizer(napi_finalize cb, void* data, void* hint) override {
napi_env env = static_cast<napi_env>(this);
node_env()->SetImmediate([=](node::Environment* node_env) {
// we need to keep the env live until the finalizer has been run
// EnvRefHolder provides an exception safe wrapper to Ref and then
// Unref once the lamba is freed
EnvRefHolder liveEnv(static_cast<napi_env>(this));
node_env()->SetImmediate([=, liveEnv = std::move(liveEnv)]
(node::Environment* node_env) {
napi_env env = liveEnv.env();
v8::HandleScope handle_scope(env->isolate);
v8::Context::Scope context_scope(env->context());
env->CallIntoModule([&](napi_env env) {