src: add cleanup hooks to node::ObjectWrap

addaleax · aduh95 · commit e9659f5280a7 · 2026-06-25T16:07:36.000+02:00
Add cleanup hooks to make sure that addons making use of this legacy API can do so safely in Worker threads or embedder-controlled Node.js instances. Refs: #63575 Fixes: #63540 Signed-off-by: Anna Henningsen <anna@addaleax.net> PR-URL: #63642 Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
diff --git a/src/node_object_wrap.h b/src/node_object_wrap.h
@@ -22,20 +22,21 @@
 #ifndef SRC_NODE_OBJECT_WRAP_H_
 #define SRC_NODE_OBJECT_WRAP_H_
 
-#include "v8.h"
 #include <cassert>
-
+#include "node.h"
 
 namespace node {
 
 class ObjectWrap {
  public:
   ObjectWrap() {
     refs_ = 0;
+    AddCleanupHook();
   }
 
 
   virtual ~ObjectWrap() {
+    RemoveCleanupHook();
     if (persistent().IsEmpty())
       return;
     persistent().ClearWeak();
@@ -123,6 +124,16 @@ class ObjectWrap {
     delete wrap;
   }
 
+  void AddCleanupHook() {
+    AddEnvironmentCleanupHook(v8::Isolate::GetCurrent(), CleanupHook, this);
+  }
+
+  void RemoveCleanupHook() {
+    RemoveEnvironmentCleanupHook(v8::Isolate::GetCurrent(), CleanupHook, this);
+  }
+
+  static void CleanupHook(void* arg) { delete static_cast<ObjectWrap*>(arg); }
+
   // NOLINTNEXTLINE(runtime/v8_persistent)
   v8::Persistent<v8::Object> handle_;
 };
