From 3e177536ba814c8a570e48f28add24248759e3d2 Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 12:10:42 -0500 Subject: [PATCH] fix: bad js-flags shouldn't crash the app (#42441) * fix: bad js-flags shouldn't crash the app Co-authored-by: Shelley Vohr * Update shell/browser/javascript_environment.cc Co-authored-by: Robo Co-authored-by: Shelley Vohr --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr --- shell/browser/javascript_environment.cc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/shell/browser/javascript_environment.cc b/shell/browser/javascript_environment.cc index 170e30536c0e..f7f13882a00b 100644 --- a/shell/browser/javascript_environment.cc +++ b/shell/browser/javascript_environment.cc @@ -124,13 +124,10 @@ JavascriptEnvironment::~JavascriptEnvironment() { 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.