src: store pointer to Environment on DestroyParam

To avoid a potential segfault when inside WeakCallback, store a reference to Environment inside DestroyParam. PR-URL: #21099 Reviewed-By: Yang Guo <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Tiancheng "Timothy" Gu <[email protected]> Co-authored-by: Yang Guo <[email protected]> Co-authored-by: Michaël Zasso <[email protected]>
nodejs · Jun 6, 2018 · 8862f0a · 8862f0a
1 parent 9d41ab4
commit 8862f0a
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/async_wrap.cc b/src/async_wrap.cc
@@ -398,6 +398,7 @@ static void DisablePromiseHook(const FunctionCallbackInfo<Value>& args) {
 class DestroyParam {
  public:
   double asyncId;
+  Environment* env;
   Persistent<Object> target;
   Persistent<Object> propBag;
 };
@@ -406,13 +407,12 @@ class DestroyParam {
 void AsyncWrap::WeakCallback(const v8::WeakCallbackInfo<DestroyParam>& info) {
   HandleScope scope(info.GetIsolate());
 
-  Environment* env = Environment::GetCurrent(info.GetIsolate());
   std::unique_ptr<DestroyParam> p{info.GetParameter()};
   Local<Object> prop_bag = PersistentToLocal(info.GetIsolate(), p->propBag);
 
-  Local<Value> val = prop_bag->Get(env->destroyed_string());
+  Local<Value> val = prop_bag->Get(p->env->destroyed_string());
   if (val->IsFalse()) {
-    AsyncWrap::EmitDestroy(env, p->asyncId);
+    AsyncWrap::EmitDestroy(p->env, p->asyncId);
   }
   // unique_ptr goes out of scope here and pointer is deleted.
 }
@@ -426,6 +426,7 @@ static void RegisterDestroyHook(const FunctionCallbackInfo<Value>& args) {
   Isolate* isolate = args.GetIsolate();
   DestroyParam* p = new DestroyParam();
   p->asyncId = args[1].As<Number>()->Value();
+  p->env = Environment::GetCurrent(args);
   p->target.Reset(isolate, args[0].As<Object>());
   p->propBag.Reset(isolate, args[2].As<Object>());
   p->target.SetWeak(