fix: use try/catch for base class converter error (electron#24450)

trop[bot] · codebytere · web-flow · commit d4a6affa4b6b · 2020-07-07T20:00:46.000-07:00
* fix: use try/catch for base class converter error

* Place try/catch in a block

Co-authored-by: Shelley Vohr &lt;shelley.vohr@gmail.com&gt;
diff --git a/shell/browser/api/electron_api_top_level_window.cc b/shell/browser/api/electron_api_top_level_window.cc
@@ -98,10 +98,14 @@ TopLevelWindow::TopLevelWindow(v8::Isolate* isolate,
   window_->AddObserver(this);
 
 #if defined(TOOLKIT_VIEWS)
-  // Sets the window icon.
-  gin::Handle<NativeImage> icon;
-  if (options.Get(options::kIcon, &icon) && !icon.IsEmpty())
-    SetIcon(icon);
+  {
+    v8::TryCatch try_catch(isolate);
+    gin::Handle<NativeImage> icon;
+    if (options.Get(options::kIcon, &icon) && !icon.IsEmpty())
+      SetIcon(icon);
+    if (try_catch.HasCaught())
+      LOG(ERROR) << "Failed to convert NativeImage";
+  }
 #endif
 }
 
