From 57df94104a8c8fa524492811dc4a92db8cd1263a Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Tue, 15 Apr 2014 14:23:40 +0200 Subject: Windows: Fix a crash in ContentMainRunnerImpl::Initialize It will try to dereference the SandboxInterfaceInfo* that we pass it. Fix the issue by creating a dummy instance on the stack when calling it. Change-Id: Ibdddf4ff9c9e5b179ec1cb1dfb4355a0f9885fd5 Reviewed-by: Michael Bruning --- src/core/web_engine_context.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/core/web_engine_context.cpp') diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index b4e54aae1..faf40f1ce 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -60,9 +60,9 @@ #include "content/utility/in_process_utility_thread.h" #include "content/renderer/in_process_renderer_thread.h" #include "content/gpu/in_process_gpu_thread.h" - #include "ui/gl/gl_switches.h" #include "gpu/command_buffer/service/gpu_switches.h" +#include "sandbox/win/src/sandbox_types.h" #include "webkit/common/user_agent/user_agent_util.h" #include "content_browser_client_qt.h" @@ -163,7 +163,12 @@ WebEngineContext::WebEngineContext() content::RenderProcessHost::RegisterRendererMainThreadFactory(content::CreateInProcessRendererThread); content::GpuProcessHost::RegisterGpuMainThreadFactory(content::CreateInProcessGpuThread); +#if defined(OS_WIN) + sandbox::SandboxInterfaceInfo sandbox_info = {0}; + m_contentRunner->Initialize(0, &sandbox_info, m_mainDelegate.get()); +#else m_contentRunner->Initialize(0, 0, m_mainDelegate.get()); +#endif m_browserRunner->Initialize(content::MainFunctionParams(*CommandLine::ForCurrentProcess())); // Once the MessageLoop has been created, attach a top-level RunLoop. -- cgit v1.2.3