node-api: fix crash in finalization

Refs: nodejs/node-addon-api#906 Refs: #37616 Fix crash introduced by #37616 Signed-off-by: Michael Dawson <[email protected]> PR-URL: #37876 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: James M Snell <[email protected]>
nodejs · Mar 24, 2021 · 42dc4d1 · 42dc4d1
1 parent f00c243
commit 42dc4d1
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/js_native_api_v8.cc b/src/js_native_api_v8.cc
@@ -374,8 +374,11 @@ class Reference : public RefBase {
   inline void Finalize(bool is_env_teardown = false) override {
     // During env teardown, `~napi_env()` alone is responsible for finalizing.
     // Thus, we don't want any stray gc passes to trigger a second call to
-    // `Finalize()`, so let's reset the persistent here.
-    if (is_env_teardown) _persistent.ClearWeak();
+    // `Finalize()`, so let's reset the persistent here if nothing is
+    // keeping it alive.
+    if (is_env_teardown && _persistent.IsWeak()) {
+      _persistent.ClearWeak();
+    }
 
     // Chain up to perform the rest of the finalization.
     RefBase::Finalize(is_env_teardown);