Browse Source

port bug 1788233

Bill Gianopoulos 2 years ago
parent
commit
230e0b1759

+ 36 - 0
comm-central/patches/9999999-port1788233-suite-bustage.patch

@@ -0,0 +1,36 @@
+# HG changeset patch
+# User Bill Gianopoulos <wgianopoulos@gmail.com>
+# Date 1662631833 0
+Bug 9999999 - Port bug 1788233 to suite.
+Bug 1788233: Remove PermissionsService from process Windows sandboxing code.
+
+diff --git a/suite/app/nsSuiteApp.cpp b/suite/app/nsSuiteApp.cpp
+--- a/suite/app/nsSuiteApp.cpp
++++ b/suite/app/nsSuiteApp.cpp
+@@ -216,26 +216,23 @@ static int do_main(int argc, char* argv[
+     // no -app flag so we use the compiled-in app data
+     config.appData = &sAppData;
+     config.appDataPath = kDesktopFolder;
+   }
+ 
+ #if defined(XP_WIN) && defined(MOZ_SANDBOX)
+   sandbox::BrokerServices* brokerServices =
+     sandboxing::GetInitializedBrokerServices();
+-  sandboxing::PermissionsService* permissionsService =
+-    sandboxing::GetPermissionsService();
+ #if defined(MOZ_CONTENT_SANDBOX)
+   if (!brokerServices) {
+     Output("Couldn't initialize the broker services.\n");
+     return 255;
+   }
+ #endif
+   config.sandboxBrokerServices = brokerServices;
+-  config.sandboxPermissionsService = permissionsService;
+ #endif
+ 
+ #ifdef LIBFUZZER
+   if (getenv("FUZZER"))
+     gBootstrap->XRE_LibFuzzerSetDriver(fuzzer::FuzzerDriver);
+ #endif
+ 
+   return gBootstrap->XRE_main(argc, argv, config);

+ 1 - 0
comm-central/patches/series

@@ -1,4 +1,5 @@
 9999999-port1787097-suite-bustage.patch
+9999999-port1788233-suite-bustage.patch
 TOP-1642188-remove-nsDOMIEvent-cc.patch
 TOP-1611010-DOMEventListener-cc.patch
 TOP-1614671-port1456035-4-and-5-61a1-cc.patch