diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-21 18:35:44 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-21 18:35:44 +0000 |
| commit | c0db95d3dda1865d4c6bf0666b0e7439b40b9bf2 (patch) | |
| tree | 74359a4b4954f9380cb0fb23b59f0c53d9355f5d /toolkit/xre | |
| parent | Releasing progress-linux version 115.9.1esr-1~deb12u1progress7u1. (diff) | |
| download | firefox-esr-c0db95d3dda1865d4c6bf0666b0e7439b40b9bf2.tar.xz firefox-esr-c0db95d3dda1865d4c6bf0666b0e7439b40b9bf2.zip | |
Merging upstream version 115.10.0esr.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'toolkit/xre')
| -rw-r--r-- | toolkit/xre/nsAppRunner.cpp | 4 | ||||
| -rw-r--r-- | toolkit/xre/nsEmbedFunctions.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 14b8c98dc8..ec23a4d39f 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -4206,7 +4206,9 @@ int XREMain::XRE_mainInit(bool* aExitFlag) { #if defined(MOZ_SANDBOX) && defined(XP_WIN) if (mAppData->sandboxBrokerServices) { - SandboxBroker::Initialize(mAppData->sandboxBrokerServices); + nsAutoString binDirPath; + MOZ_ALWAYS_SUCCEEDS(xreBinDirectory->GetPath(binDirPath)); + SandboxBroker::Initialize(mAppData->sandboxBrokerServices, binDirPath); } else { # if defined(MOZ_SANDBOX) // If we're sandboxing content and we fail to initialize, then crashing here diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp index e3d975ca18..d2cc2506aa 100644 --- a/toolkit/xre/nsEmbedFunctions.cpp +++ b/toolkit/xre/nsEmbedFunctions.cpp @@ -529,7 +529,7 @@ nsresult XRE_InitChildProcess(int aArgc, char* aArgv[], #if defined(XP_WIN) # if defined(MOZ_SANDBOX) if (aChildData->sandboxBrokerServices) { - SandboxBroker::Initialize(aChildData->sandboxBrokerServices); + SandboxBroker::Initialize(aChildData->sandboxBrokerServices, u""_ns); SandboxBroker::GeckoDependentInitialize(); } # endif // defined(MOZ_SANDBOX) |