src: delete BaseObjectWeakPtr data when pointee is gone

Fix the condition for deleting the underlying data pointed to by a `BaseObjectWeakPtr`, which erroneously skipped that deletion when `ptr->get()` was `nullptr`. This fixes a memory leak reported by some of the tests. Refs: nodejs#30374 (comment) PR-URL: nodejs#32393 Reviewed-By: Matheus Marchini <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
addaleax · Apr 1, 2020 · d85cb07 · d85cb07
1 parent 4d3275b
commit d85cb07
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/base_object-inl.h b/src/base_object-inl.h
@@ -230,13 +230,13 @@ BaseObject* BaseObjectPtrImpl<T, kIsWeak>::get_base_object() const {
 
 template <typename T, bool kIsWeak>
 BaseObjectPtrImpl<T, kIsWeak>::~BaseObjectPtrImpl() {
-  if (get() == nullptr) return;
   if (kIsWeak) {
-    if (--pointer_data()->weak_ptr_count == 0 &&
+    if (pointer_data() != nullptr &&
+        --pointer_data()->weak_ptr_count == 0 &&
         pointer_data()->self == nullptr) {
       delete pointer_data();
     }
-  } else {
+  } else if (get() != nullptr) {
     get()->decrease_refcount();
   }
 }