wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 6bba1d23fd2c (bug 1256992) for problems in conflict resolution

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2016-04-13 16:23:59 +02:00
parent f941ff23d8
commit 611f4cad0d
4 changed files with 13 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/xpconnect/src/XPCShellImpl.cpp
View File

@ -44,9 +44,6 @@
#ifdef XP_WIN
#include "mozilla/widget/AudioSession.h"
#include <windows.h>
#if defined(MOZ_SANDBOX)
#include "SandboxBroker.h"
#endif
#endif
// all this crap is needed to do the interactive shell stuff
@ -1521,14 +1518,6 @@ XRE_XPCShellMain(int argc, char** argv, char** envp)
// Plugin may require audio session if installed plugin can initialize
// asynchronized.
AutoAudioSession audioSession;
#if defined(MOZ_SANDBOX)
// Required for sandboxed child processes.
if (!SandboxBroker::Initialize()) {
NS_WARNING("Failed to initialize broker services, sandboxed "
"processes will fail to start.");
}
#endif
#endif
{

31
security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp
View File

@ -17,31 +17,22 @@ namespace mozilla
sandbox::BrokerServices *SandboxBroker::sBrokerService = nullptr;
/* static */
bool
SandboxBroker::Initialize()
{
sBrokerService = sandbox::SandboxFactory::GetBrokerServices();
if (!sBrokerService) {
return false;
}
if (sBrokerService->Init() != sandbox::SBOX_ALL_OK) {
sBrokerService = nullptr;
return false;
}
return true;
}
SandboxBroker::SandboxBroker()
{
// XXX: This is not thread-safe! Two threads could simultaneously try
// to set `sBrokerService`
if (!sBrokerService) {
sBrokerService = sandbox::SandboxFactory::GetBrokerServices();
if (sBrokerService) {
mPolicy = sBrokerService->CreatePolicy();
} else {
mPolicy = nullptr;
sandbox::ResultCode result = sBrokerService->Init();
if (result != sandbox::SBOX_ALL_OK) {
sBrokerService = nullptr;
}
}
}
mPolicy = sBrokerService->CreatePolicy();
}
bool
SandboxBroker::LaunchApp(const wchar_t *aPath,

3
security/sandbox/win/src/sandboxbroker/sandboxBroker.h
View File

@ -27,9 +27,6 @@ class SANDBOX_EXPORT SandboxBroker
{
public:
SandboxBroker();
static bool Initialize();
bool LaunchApp(const wchar_t *aPath,
const wchar_t *aArguments,
const bool aEnableLogging,

26
toolkit/xre/nsAppRunner.cpp
View File

@ -209,12 +209,8 @@
#include "AndroidBridge.h"
#endif
#if defined(MOZ_SANDBOX)
#if defined(XP_LINUX) && !defined(ANDROID)
#if defined(MOZ_SANDBOX) && defined(XP_LINUX) && !defined(ANDROID)
#include "mozilla/SandboxInfo.h"
#elif defined(XP_WIN)
#include "SandboxBroker.h"
#endif
#endif
extern uint32_t gRestartMode;
@ -3726,12 +3722,6 @@ XREMain::XRE_mainStartup(bool* aExitFlag)
int result;
#ifdef XP_WIN
UseParentConsole();
#if defined(MOZ_SANDBOX)
if (!SandboxBroker::Initialize()) {
NS_WARNING("Failed to initialize broker services, sandboxed processes "
"will fail to start.");
}
#endif
#endif
// RunGTest will only be set if we're in xul-unit
if (mozilla::RunGTest) {
@ -4317,20 +4307,6 @@ XREMain::XRE_mainRun()
}
#endif /* MOZ_INSTRUMENT_EVENT_LOOP */
#if defined(MOZ_SANDBOX) && defined(XP_WIN)
if (!SandboxBroker::Initialize()) {
#if defined(MOZ_CONTENT_SANDBOX)
// If we're sandboxing content and we fail to initialize, then crashing here
// seems like the sensible option.
if (BrowserTabsRemoteAutostart()) {
MOZ_CRASH("Failed to initialize broker services, can't continue.");
}
#endif
// Otherwise just warn for the moment, as most things will work.
NS_WARNING("Failed to initialize broker services, sandboxed processes will "
"fail to start.");
}
#endif
#if (defined(XP_WIN) || defined(XP_MACOSX)) && defined(MOZ_CONTENT_SANDBOX)
SetUpSandboxEnvironment();
#endif