Skip to content

src: avoid accessing EnvInst on Env destruction #468

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

Open
santigimeno wants to merge 1 commit into
base: node-v24.x-nsolid-v6.x
Choose a base branch
from
+19 −7
Open

src: avoid accessing EnvInst on Env destruction #468

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 19 additions & 7 deletions src/nsolid/nsolid_api.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1352,12 +1352,16 @@ void EnvList::PromiseTracking(bool promiseTracking) {
}

for (auto& entry : env_map) {
EnvInst* envinst = entry.second.get();
if (envinst->env()->nsolid_track_promises_fn().IsEmpty())
SharedEnvInst envinst_sp = entry.second;
EnvInst::Scope lock(envinst_sp);
if (!lock.Success())
continue;

if (envinst_sp->env()->nsolid_track_promises_fn().IsEmpty())
continue;

int er = EnvInst::RunCommand(
EnvInst::GetInst(envinst->thread_id()),
envinst_sp,
Comment thread
santigimeno marked this conversation as resolved.
promiseTracking ? enable_promise_tracking_ : disable_promise_tracking_,
nullptr,
CommandType::InterruptOnly);
Expand Down Expand Up @@ -1389,8 +1393,12 @@ void EnvList::UpdateTracingFlags(uint32_t flags) {
}

for (auto& entry : env_map) {
SharedEnvInst envinst = entry.second;
int er = RunCommand(envinst,
SharedEnvInst envinst_sp = entry.second;
EnvInst::Scope lock(envinst_sp);
if (!lock.Success())
continue;

int er = RunCommand(envinst_sp,
CommandType::InterruptOnly,
update_tracing_flags,
flags);
Expand Down Expand Up @@ -2053,8 +2061,12 @@ void EnvList::UpdateHasMetricsStreamHooks(bool has_metrics) {
}

for (auto& entry : env_map) {
SharedEnvInst envinst = entry.second;
int er = RunCommand(envinst,
SharedEnvInst envinst_sp = entry.second;
EnvInst::Scope lock(envinst_sp);
if (!lock.Success())
continue;

int er = RunCommand(envinst_sp,
CommandType::InterruptOnly,
update_has_metrics_stream_hooks,
has_metrics);
Expand Down
Loading