src: use smart pointer in AsyncWrap::WeakCallback

danbev · danbev · commit 1e3dd8bf5589 · 2018-03-08T05:40:40.000+01:00
PR-URL: #19168 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
diff --git a/src/async_wrap.cc b/src/async_wrap.cc
@@ -415,14 +415,14 @@ void AsyncWrap::WeakCallback(const v8::WeakCallbackInfo<DestroyParam>& info) {
   HandleScope scope(info.GetIsolate());
 
   Environment* env = Environment::GetCurrent(info.GetIsolate());
-  DestroyParam* p = info.GetParameter();
+  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());
   if (val->IsFalse()) {
     AsyncWrap::EmitDestroy(env, p->asyncId);
   }
-  delete p;
+  // unique_ptr goes out of scope here and pointer is deleted.
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -415,14 +415,14 @@ void AsyncWrap::WeakCallback(const v8::WeakCallbackInfo<DestroyParam>& info) {`
`415`	`415`	`HandleScope scope(info.GetIsolate());`
`416`	`416`
`417`	`417`	`Environment* env = Environment::GetCurrent(info.GetIsolate());`
`418`		`- DestroyParam* p = info.GetParameter();`
	`418`	`+ std::unique_ptr<DestroyParam> p{info.GetParameter()};`
`419`	`419`	`Local<Object> prop_bag = PersistentToLocal(info.GetIsolate(), p->propBag);`
`420`	`420`
`421`	`421`	`Local<Value> val = prop_bag->Get(env->destroyed_string());`
`422`	`422`	`if (val->IsFalse()) {`
`423`	`423`	`AsyncWrap::EmitDestroy(env, p->asyncId);`
`424`	`424`	`}`
`425`		`- delete p;`
	`425`	`+ // unique_ptr goes out of scope here and pointer is deleted.`
`426`	`426`	`}`
`427`	`427`
`428`	`428`