From 5718ea4e1e5ce61cf80fb42509fcc18c5b1e9544 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@charleskerr.com>
Date: Mon, 9 Sep 2024 12:14:40 -0500
Subject: [PATCH] fix: out-of-scope Local handle in node::CallbackScope
 (#43622)

refactor: use an EscapableHandleScope
---
 .../common/gin_helper/event_emitter_caller.cc | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/shell/common/gin_helper/event_emitter_caller.cc b/shell/common/gin_helper/event_emitter_caller.cc
index 124a300cb4e9..0c7b0551945d 100644
--- a/shell/common/gin_helper/event_emitter_caller.cc
+++ b/shell/common/gin_helper/event_emitter_caller.cc
@@ -13,15 +13,14 @@ v8::Local<v8::Value> CallMethodWithArgs(v8::Isolate* isolate,
                                         v8::Local<v8::Object> obj,
                                         const char* method,
                                         ValueVector* args) {
-  // An active node::Environment is required for node::MakeCallback.
-  std::unique_ptr<node::CallbackScope> callback_scope;
-  if (node::Environment::GetCurrent(isolate)) {
-    v8::HandleScope handle_scope(isolate);
-    callback_scope = std::make_unique<node::CallbackScope>(
-        isolate, v8::Object::New(isolate), node::async_context{0, 0});
-  } else {
-    return v8::Boolean::New(isolate, false);
-  }
+  v8::EscapableHandleScope handle_scope{isolate};
+
+  // CallbackScope and MakeCallback both require an active node::Environment
+  if (!node::Environment::GetCurrent(isolate))
+    return handle_scope.Escape(v8::Boolean::New(isolate, false));
+
+  node::CallbackScope callback_scope{isolate, v8::Object::New(isolate),
+                                     node::async_context{0, 0}};
 
   // Perform microtask checkpoint after running JavaScript.
   gin_helper::MicrotasksScope microtasks_scope{
@@ -36,11 +35,10 @@ v8::Local<v8::Value> CallMethodWithArgs(v8::Isolate* isolate,
   // of MakeCallback will be empty and therefore ToLocal will be false, in this
   // case we need to return "false" as that indicates that the event emitter did
   // not handle the event
-  v8::Local<v8::Value> localRet;
-  if (ret.ToLocal(&localRet))
-    return localRet;
+  if (v8::Local<v8::Value> localRet; ret.ToLocal(&localRet))
+    return handle_scope.Escape(localRet);
 
-  return v8::Boolean::New(isolate, false);
+  return handle_scope.Escape(v8::Boolean::New(isolate, false));
 }
 
 }  // namespace gin_helper::internal