Fix getCommandValues and sandbox crashes (#107)

macro-inc · Nov 29, 2023 · b0f14a2 · b0f14a2
2 parents 2066f10 + f164018
commit b0f14a2
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 10 deletions.
diff --git a/src/electron/ELECTRON_VERSION b/src/electron/ELECTRON_VERSION
@@ -1 +1 @@
-20.3.0-rc9
+20.3.0-rc10
diff --git a/src/electron/office/document_client.cc b/src/electron/office/document_client.cc
@@ -785,13 +785,29 @@ v8::Local<v8::Promise> DocumentClient::GetCommandValues(
         if (!result) {
           return promise.Resolve();
         }
-        v8::Local<v8::String> res_json_str;
-        if (!v8::String::NewFromUtf8(promise.isolate(), result.get())
-                 .ToLocal(&res_json_str)) {
-          return promise.Resolve();
-        }
-        promise.Resolve(v8::JSON::Parse(promise.GetContext(), res_json_str)
-                            .FromMaybe(v8::Local<v8::Value>()));
+        promise.task_runner()->PostTask(
+            FROM_HERE,
+            base::BindOnce(
+                [](Promise<v8::Value> promise, LokStrPtr result,
+                   base::WeakPtr<OfficeClient> office) {
+                  if (!office.MaybeValid())
+                    return;
+                  v8::Isolate* isolate = promise.isolate();
+                  v8::HandleScope handle_scope(isolate);
+                  v8::MicrotasksScope microtasks_scope(
+                      isolate, v8::MicrotasksScope::kDoNotRunMicrotasks);
+                  v8::Context::Scope context_scope(promise.GetContext());
+
+                  v8::Local<v8::String> res_json_str;
+                  if (!v8::String::NewFromUtf8(promise.isolate(), result.get())
+                           .ToLocal(&res_json_str)) {
+                    return promise.Resolve();
+                  }
+                  promise.Resolve(
+                      v8::JSON::Parse(promise.GetContext(), res_json_str)
+                          .FromMaybe(v8::Local<v8::Value>()));
+                },
+                std::move(promise), std::move(result), std::move(office)));
       },
       std::move(promise), command, OfficeClient::GetWeakPtr()));
 

diff --git a/src/electron/office/office_instance.cc b/src/electron/office/office_instance.cc
@@ -74,6 +74,7 @@ bool OfficeInstance::IsValid() {
 }
 
 void OfficeInstance::Unset() {
+	if (!Get()) return;
   Get()->unset_ = true;
   Get()->instance_.reset();
 }

diff --git a/src/electron/shell/renderer/renderer_client_base.cc b/src/electron/shell/renderer/renderer_client_base.cc
@@ -295,8 +295,7 @@ void RendererClientBase::RenderThreadStarted() {
 
 #if BUILDFLAG(ENABLE_OFFICE)
   // we only start LO in non-sandboxed processes
-  if (!command_line->HasSwitch(switches::kEnableSandbox) ||
-      command_line->HasSwitch(sandbox::policy::switches::kNoSandbox)) {
+  if (command_line->HasSwitch(sandbox::policy::switches::kNoSandbox)) {
     office::OfficeInstance::Create();
   }
 #endif