Skip to content

n-api: fix use-after-free with napi_remove_async_cleanup_hook #34662

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
addaleax wants to merge 3 commits into from
Closed

n-api: fix use-after-free with napi_remove_async_cleanup_hook #34662

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ff8795
src: fix `size` underflow in CallbackQueue
addaleax Aug 7, 2020
60941d6
src: spin shutdown loop while immediates are pending
addaleax Aug 7, 2020
b94ceaf
n-api: fix use-after-free with napi_remove_async_cleanup_hook
addaleax Aug 7, 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
n-api: fix use-after-free with napi_remove_async_cleanup_hook 
Fixes: #34657
Refs: #34572
  • Loading branch information
@addaleax
addaleax committed Aug 7, 2020
commit b94ceaf88d9c6662fc53f7991c967203c5007d85
6 changes: 6 additions & 0 deletions src/node_api.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,7 @@ napi_status napi_add_async_cleanup_hook(
auto handle = node::AddEnvironmentCleanupHook(env->isolate, fun, arg);
if (remove_handle != nullptr) {
*remove_handle = new napi_async_cleanup_hook_handle__ { std::move(handle) };
env->Ref();
}

return napi_clear_last_error(env);
Expand All @@ -547,6 +548,11 @@ napi_status napi_remove_async_cleanup_hook(
node::RemoveEnvironmentCleanupHook(std::move(remove_handle->handle));
delete remove_handle;

// Release the `env` handle asynchronously since it would be surprising if
// a call to a N-API function would destroy `env` synchronously.
static_cast<node_napi_env>(env)->node_env()
->SetImmediate([env](node::Environment*) { env->Unref(); });

return napi_clear_last_error(env);
}

Expand Down