Skip to content

Commit

Permalink
src: fix uninitialized field access in AsyncHooks
Browse files Browse the repository at this point in the history
Co-authored-by: Joyee Cheung <[email protected]>
PR-URL: #48566
  • Loading branch information
jkrems and joyeecheung committed Jun 30, 2023
1 parent 32eb492 commit 0481b27
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
12 changes: 5 additions & 7 deletions src/env.cc
Original file line number Diff line number Diff line change
Expand Up @@ -170,15 +170,13 @@ bool AsyncHooks::pop_async_context(double async_id) {
}

void AsyncHooks::clear_async_id_stack() {
if (env()->can_call_into_js()) {
if (!js_execution_async_resources_.IsEmpty() && env()->can_call_into_js()) {
Isolate* isolate = env()->isolate();
HandleScope handle_scope(isolate);
if (!js_execution_async_resources_.IsEmpty()) {
USE(PersistentToLocal::Strong(js_execution_async_resources_)
->Set(env()->context(),
env()->length_string(),
Integer::NewFromUnsigned(isolate, 0)));
}
USE(PersistentToLocal::Strong(js_execution_async_resources_)
->Set(env()->context(),
env()->length_string(),
Integer::NewFromUnsigned(isolate, 0)));
}

native_execution_async_resources_.clear();
Expand Down
7 changes: 4 additions & 3 deletions src/env.h
Original file line number Diff line number Diff line change
Expand Up @@ -1015,6 +1015,10 @@ class Environment : public MemoryRetainer {
uv_async_t task_queues_async_;
int64_t task_queues_async_refs_ = 0;

// These are read by async_hooks_ ctor and need to be listed before it.
std::atomic_bool is_stopping_{false};
std::atomic_bool can_call_into_js_{true};

AsyncHooks async_hooks_;
ImmediateInfo immediate_info_;
AliasedInt32Array timeout_info_;
Expand Down Expand Up @@ -1092,7 +1096,6 @@ class Environment : public MemoryRetainer {

bool has_serialized_options_ = false;

std::atomic_bool can_call_into_js_ { true };
uint64_t flags_;
uint64_t thread_id_;
std::unordered_set<worker::Worker*> sub_worker_contexts_;
Expand Down Expand Up @@ -1150,8 +1153,6 @@ class Environment : public MemoryRetainer {
CleanupQueue cleanup_queue_;
bool started_cleanup_ = false;

std::atomic_bool is_stopping_ { false };

std::unordered_set<int> unmanaged_fds_;

std::function<void(Environment*, ExitCode)> process_exit_handler_{
Expand Down

0 comments on commit 0481b27

Please sign in to comment.