nodejs
diff --git a/‎src/cares_wrap.cc‎
Lines changed: 2 additions & 0 deletions b/‎src/cares_wrap.cc‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/handle_wrap.cc‎
Lines changed: 1 addition & 2 deletions b/‎src/handle_wrap.cc‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎src/node_crypto.cc‎
Lines changed: 2 additions & 0 deletions b/‎src/node_crypto.cc‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/req-wrap-inl.h‎
Lines changed: 1 addition & 0 deletions b/‎src/req-wrap-inl.h‎
Lines changed: 1 addition & 0 deletions
@@ -9,6 +9,7 @@
 #include "req-wrap-inl.h"
 #include "tree.h"
 #include "util.h"
+#include "util-inl.h"
 #include "uv.h"
 
 #include <errno.h>
@@ -258,6 +259,7 @@ class QueryWrap : public AsyncWrap {
 
   ~QueryWrap() override {
     CHECK_EQ(false, persistent().IsEmpty());
+    ClearWrap(object());
     persistent().Reset();
   }
 
 
@@ -90,13 +90,12 @@ void HandleWrap::OnClose(uv_handle_t* handle) {
 
   HandleScope handle_scope(env->isolate());
   Context::Scope context_scope(env->context());
-  Local<Object> object = wrap->object();
 
   if (wrap->flags_ & kCloseCallback) {
     wrap->MakeCallback(env->onclose_string(), 0, nullptr);
   }
 
-  object->SetAlignedPointerInInternalField(0, nullptr);
+  ClearWrap(wrap->object());
   wrap->persistent().Reset();
   delete wrap;
 }
 
@@ -4761,6 +4761,7 @@ class PBKDF2Request : public AsyncWrap {
 
   ~PBKDF2Request() override {
     release();
+    ClearWrap(object());
     persistent().Reset();
   }
 
@@ -5026,6 +5027,7 @@ class RandomBytesRequest : public AsyncWrap {
   }
 
   ~RandomBytesRequest() override {
+    ClearWrap(object());
     persistent().Reset();
   }
 
 
@@ -28,6 +28,7 @@ template <typename T>
 ReqWrap<T>::~ReqWrap() {
   CHECK_EQ(req_.data, this);  // Assert that someone has called Dispatched().
   CHECK_EQ(false, persistent().IsEmpty());
+  ClearWrap(object());
   persistent().Reset();
 }
Original file line number	Diff line number	Diff line change
@@ -90,13 +90,12 @@ void HandleWrap::OnClose(uv_handle_t* handle) {
90	90
91	91	HandleScope handle_scope(env->isolate());
92	92	Context::Scope context_scope(env->context());
93		- Local<Object> object = wrap->object();
94	93
95	94	if (wrap->flags_ & kCloseCallback) {
96	95	wrap->MakeCallback(env->onclose_string(), 0, nullptr);
97	96	}
98	97
99		- object->SetAlignedPointerInInternalField(0, nullptr);
	98	+ ClearWrap(wrap->object());
100	99	wrap->persistent().Reset();
101	100	delete wrap;
102	101	}
Original file line number	Diff line number	Diff line change
@@ -4761,6 +4761,7 @@ class PBKDF2Request : public AsyncWrap {
4761	4761
4762	4762	~PBKDF2Request() override {
4763	4763	release();
	4764	+ ClearWrap(object());
4764	4765	persistent().Reset();
4765	4766	}
4766	4767
@@ -5026,6 +5027,7 @@ class RandomBytesRequest : public AsyncWrap {
5026	5027	}
5027	5028
5028	5029	~RandomBytesRequest() override {
	5030	+ ClearWrap(object());
5029	5031	persistent().Reset();
5030	5032	}
5031	5033
Original file line number	Diff line number	Diff line change
@@ -28,6 +28,7 @@ template <typename T>
28	28	ReqWrap<T>::~ReqWrap() {
29	29	CHECK_EQ(req_.data, this); // Assert that someone has called Dispatched().
30	30	CHECK_EQ(false, persistent().IsEmpty());
	31	+ ClearWrap(object());
31	32	persistent().Reset();
32	33	}
33	34