From 32ff10cf6bb5a5cea1e364791ab4e699f4a8c31c Mon Sep 17 00:00:00 2001 From: Fedor Indutny Date: Wed, 31 Mar 2021 14:55:53 -0700 Subject: [PATCH] src: move CHECK in AddIsolateFinishedCallback `CHECK(it->second)` asserts that we have `PerIsolatePlatformData` in the `per_isolate_` map, and not just a key with empty value. When `it == per_isolate_.end()`, however, it means that we don't have the isolate and the `CHECK(it->second)` is guaranteed to fail then! PR-URL: https://github.com/nodejs/node/pull/38010 Reviewed-By: Anna Henningsen Reviewed-By: Colin Ihrig Reviewed-By: James M Snell --- src/node_platform.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node_platform.cc b/src/node_platform.cc index d7b394aae81ed9..8703372818770b 100644 --- a/src/node_platform.cc +++ b/src/node_platform.cc @@ -359,10 +359,10 @@ void NodePlatform::AddIsolateFinishedCallback(Isolate* isolate, Mutex::ScopedLock lock(per_isolate_mutex_); auto it = per_isolate_.find(isolate); if (it == per_isolate_.end()) { - CHECK(it->second); cb(data); return; } + CHECK(it->second); it->second->AddShutdownCallback(cb, data); }