1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

src: do not access Environment-owned handles after cleanup

Browse Source 
Do not access handles that have already begun to be closed
or are closed.

PR-URL: https://github.com/nodejs/node/pull/26256
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
This commit is contained in:
Anna Henningsen 2019-02-21 23:54:05 +01:00
parent d14cba401a
commit cb9d0ec113
No known key found for this signature in database
GPG Key ID: 9C63F3A6CD2AD8F9
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/env.cc
View File

@ -398,7 +398,11 @@ void Environment::RegisterHandleCleanups() {
void* arg) { void* arg) {
handle->data = env; handle->data = env;
env->CloseHandle(handle, [](uv_handle_t* handle) {}); env->CloseHandle(handle, [](uv_handle_t* handle) {
#ifdef DEBUG
memset(handle, 0xab, uv_handle_size(handle->type));
#endif
});
}; };
RegisterHandleCleanup( RegisterHandleCleanup(
@ -512,6 +516,7 @@ void Environment::PrintSyncTrace() const {
} }
void Environment::RunCleanup() { void Environment::RunCleanup() {
started_cleanup_ = true;
TraceEventScope trace_scope(TRACING_CATEGORY_NODE1(environment), TraceEventScope trace_scope(TRACING_CATEGORY_NODE1(environment),
"RunCleanup", this); "RunCleanup", this);
CleanupHandles(); CleanupHandles();
@ -660,10 +665,13 @@ void Environment::RunAndClearNativeImmediates() {
void Environment::ScheduleTimer(int64_t duration_ms) { void Environment::ScheduleTimer(int64_t duration_ms) {
if (started_cleanup_) return;
uv_timer_start(timer_handle(), RunTimers, duration_ms, 0); uv_timer_start(timer_handle(), RunTimers, duration_ms, 0);
} }
void Environment::ToggleTimerRef(bool ref) { void Environment::ToggleTimerRef(bool ref) {
if (started_cleanup_) return;
if (ref) { if (ref) {
uv_ref(reinterpret_cast<uv_handle_t*>(timer_handle())); uv_ref(reinterpret_cast<uv_handle_t*>(timer_handle()));
} else { } else {
@ -763,6 +771,8 @@ void Environment::CheckImmediate(uv_check_t* handle) {
} }
void Environment::ToggleImmediateRef(bool ref) { void Environment::ToggleImmediateRef(bool ref) {
if (started_cleanup_) return;
if (ref) { if (ref) {
// Idle handle is needed only to stop the event loop from blocking in poll. // Idle handle is needed only to stop the event loop from blocking in poll.
uv_idle_start(immediate_idle_handle(), [](uv_idle_t*){ }); uv_idle_start(immediate_idle_handle(), [](uv_idle_t*){ });

1
src/env.h
View File

@ -1173,6 +1173,7 @@ class Environment {
CleanupHookCallback::Hash, CleanupHookCallback::Hash,
CleanupHookCallback::Equal> cleanup_hooks_; CleanupHookCallback::Equal> cleanup_hooks_;
uint64_t cleanup_hook_counter_ = 0; uint64_t cleanup_hook_counter_ = 0;
bool started_cleanup_ = false;
static void EnvPromiseHook(v8::PromiseHookType type, static void EnvPromiseHook(v8::PromiseHookType type,
v8::Local<v8::Promise> promise, v8::Local<v8::Promise> promise,