Skip to content

Commit

Permalink
src: manage MakeContext() pointer with unique_ptr
Browse files Browse the repository at this point in the history
PR-URL: #28616
Refs: #28452
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
  • Loading branch information
cjihrig authored and targos committed Jul 20, 2019
1 parent 22daf95 commit 3c418d9
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions src/node_contextify.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
}


Expand Down

0 comments on commit 3c418d9

Please sign in to comment.