|
@@ -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);
|