src: fix closing weak HandleWraps on GC

In 0af62aa, this was overlooked, with it possibly leading to hard crashes. Refs: #29317 PR-URL: #29640 Reviewed-By: Ben Coe <[email protected]> Reviewed-By: Rich Trott <[email protected]>
nodejs · Sep 25, 2019 · f84f1db · f84f1db
1 parent c718c60
commit f84f1db
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/handle_wrap.cc b/src/handle_wrap.cc
@@ -72,11 +72,11 @@ void HandleWrap::Close(Local<Value> close_callback) {
   if (state_ != kInitialized)
     return;
 
-  CHECK_EQ(false, persistent().IsEmpty());
   uv_close(handle_, OnClose);
   state_ = kClosing;
 
-  if (!close_callback.IsEmpty() && close_callback->IsFunction()) {
+  if (!close_callback.IsEmpty() && close_callback->IsFunction() &&
+      !persistent().IsEmpty()) {
     object()->Set(env()->context(),
                   env()->handle_onclose_symbol(),
                   close_callback).Check();

diff --git a/test/sequential/test-performance-eventloopdelay.js b/test/sequential/test-performance-eventloopdelay.js
@@ -1,3 +1,4 @@
+// Flags: --expose-gc
 'use strict';
 
 const common = require('../common');
@@ -97,3 +98,7 @@ const {
   }
   spinAWhile();
 }
+
+// Make sure that the histogram instances can be garbage-collected without
+// and not just implictly destroyed when the Environment is torn down.
+process.on('exit', global.gc);