Fix ExecuteScript crash (#25878)

Author: supermassive

components/brave_wallet/renderer/js_ethereum_provider.cc

@@ -36,6 +36,7 @@
 #include "third_party/blink/public/web/web_local_frame.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/origin.h"
+
 namespace {
 
 constexpr char kBraveEthereum[] = "braveEthereum";
@@ -192,13 +193,14 @@ void JSEthereumProvider::Install(bool install_ethereum_provider,
   // invocation: Function must be called on an object of type
   // JSEthereumProvider" error.
   blink::WebLocalFrame* web_frame = render_frame->GetWebFrame();
-  v8::Local<v8::Proxy> ethereum_proxy;
-  auto ethereum_proxy_handler_val =
-      ExecuteScript(web_frame, kEthereumProxyHandlerScript);
+  v8::Local<v8::Value> ethereum_proxy_handler_val;
+  if (!ExecuteScript(web_frame, kEthereumProxyHandlerScript)
+           .ToLocal(&ethereum_proxy_handler_val)) {
+    return;
+  }
   v8::Local<v8::Object> ethereum_proxy_handler_obj =
-      ethereum_proxy_handler_val.ToLocalChecked()
-          ->ToObject(context)
-          .ToLocalChecked();
+      ethereum_proxy_handler_val->ToObject(context).ToLocalChecked();
+  v8::Local<v8::Proxy> ethereum_proxy;
   if (!v8::Proxy::New(context, provider_object, ethereum_proxy_handler_obj)
            .ToLocal(&ethereum_proxy)) {
     return;

components/brave_wallet/renderer/js_solana_provider.cc

@@ -164,13 +164,14 @@ void JSSolanaProvider::Install(bool allow_overwrite_window_solana,
   // Create a proxy to the actual JSSolanaProvider object which will be
   // exposed via window.braveSolana and window.solana.
   blink::WebLocalFrame* web_frame = render_frame->GetWebFrame();
-  v8::Local<v8::Proxy> solana_proxy;
-  auto solana_proxy_handler_val =
-      ExecuteScript(web_frame, kSolanaProxyHandlerScript);
+  v8::Local<v8::Value> solana_proxy_handler_val;
+  if (!ExecuteScript(web_frame, kSolanaProxyHandlerScript)
+           .ToLocal(&solana_proxy_handler_val)) {
+    return;
+  }
   v8::Local<v8::Object> solana_proxy_handler_obj =
-      solana_proxy_handler_val.ToLocalChecked()
-          ->ToObject(context)
-          .ToLocalChecked();
+      solana_proxy_handler_val->ToObject(context).ToLocalChecked();
+  v8::Local<v8::Proxy> solana_proxy;
   if (!v8::Proxy::New(context, provider_object, solana_proxy_handler_obj)
            .ToLocal(&solana_proxy)) {
     return;
@@ -630,8 +631,11 @@ void JSSolanaProvider::WalletStandardInit(gin::Arguments* arguments) {
       {"(function() {", LoadDataResource(IDR_BRAVE_WALLET_STANDARD_JS),
        "return walletStandardBrave; })()"});
 
-  v8::Local<v8::Value> wallet_standard =
-      ExecuteScript(web_frame, wallet_standard_module_str).ToLocalChecked();
+  v8::Local<v8::Value> wallet_standard;
+  if (!ExecuteScript(web_frame, wallet_standard_module_str)
+           .ToLocal(&wallet_standard)) {
+    return;
+  }
   v8::Local<v8::Value> object;
   v8::Isolate* isolate = arguments->isolate();
   v8::Local<v8::Context> context = isolate->GetCurrentContext();