src: manage MakeContext() pointer with unique_ptr

cjihrig · targos · commit 3c418d96292d · 2019-07-20T11:10:22.000+02:00
PR-URL: #28616 Refs: #28452 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Rich Trott <rtrott@gmail.com>
diff --git a/src/node_contextify.cc b/src/node_contextify.cc
@@ -255,24 +255,21 @@ void ContextifyContext::MakeContext(const FunctionCallbackInfo<Value>& args) {
   options.allow_code_gen_wasm = args[4].As<Boolean>();
 
   TryCatchScope try_catch(env);
-  ContextifyContext* context = new ContextifyContext(env, sandbox, options);
+  auto context_ptr = std::make_unique<ContextifyContext>(env, sandbox, options);
 
   if (try_catch.HasCaught()) {
     if (!try_catch.HasTerminated())
       try_catch.ReThrow();
-    delete context;
     return;
   }
 
-  if (context->context().IsEmpty()) {
-    delete context;
+  if (context_ptr->context().IsEmpty())
     return;
-  }
 
   sandbox->SetPrivate(
       env->context(),
       env->contextify_context_private_symbol(),
-      External::New(env->isolate(), context));
+      External::New(env->isolate(), context_ptr.release()));
 }
 
 
