Browse Source

fix: bad js-flags shouldn't crash the app (#42442)

* fix: bad js-flags shouldn't crash the app

Co-authored-by: Shelley Vohr <[email protected]>

* Update shell/browser/javascript_environment.cc

Co-authored-by: Robo <[email protected]>

Co-authored-by: Shelley Vohr <[email protected]>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <[email protected]>
trop[bot] 10 months ago
parent
commit
3fd34fc4b6
1 changed files with 3 additions and 6 deletions
  1. 3 6
      shell/browser/javascript_environment.cc

+ 3 - 6
shell/browser/javascript_environment.cc

@@ -282,13 +282,10 @@ class TracingControllerImpl : public node::tracing::TracingController {
 v8::Isolate* JavascriptEnvironment::Initialize(uv_loop_t* event_loop,
                                                bool setup_wasm_streaming) {
   auto* cmd = base::CommandLine::ForCurrentProcess();
-
   // --js-flags.
-  std::string js_flags =
-      cmd->GetSwitchValueASCII(blink::switches::kJavaScriptFlags);
-  js_flags.append(" --no-freeze-flags-after-init");
-  if (!js_flags.empty())
-    v8::V8::SetFlagsFromString(js_flags.c_str(), js_flags.size());
+  std::string js_flags = "--no-freeze-flags-after-init ";
+  js_flags.append(cmd->GetSwitchValueASCII(blink::switches::kJavaScriptFlags));
+  v8::V8::SetFlagsFromString(js_flags.c_str(), js_flags.size());
 
   // The V8Platform of gin relies on Chromium's task schedule, which has not
   // been started at this point, so we have to rely on Node's V8Platform.