Bug 1201438 - Fixup for builds with disabled sandbox.
authorJacek Caban <jacek@codeweavers.com>
Wed, 09 Sep 2015 14:17:12 +0200
changeset 261577 41005726fcc1dcf1f47f07f1c8830a6c45b8c0f7
parent 261576 a3197d3b445b7e6cd005d908e4f581308d84428a
child 261578 30be2da3c09062a275e78db9c83265c50784615b
push id15105
push userkwierso@gmail.com
push dateWed, 09 Sep 2015 20:53:22 +0000
treeherderfx-team@dd2a1d737a64 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1201438
milestone43.0a1
Bug 1201438 - Fixup for builds with disabled sandbox.
ipc/glue/GeckoChildProcessHost.cpp
--- a/ipc/glue/GeckoChildProcessHost.cpp
+++ b/ipc/glue/GeckoChildProcessHost.cpp
@@ -979,23 +979,25 @@ GeckoChildProcessHost::PerformAsyncLaunc
                              cmdLine.command_line_string().c_str(),
                              mEnableSandboxLogging,
                              &process);
   } else
 #endif
   {
     base::LaunchApp(cmdLine, false, false, &process);
 
+#ifdef MOZ_SANDBOX
     // We need to be able to duplicate handles to non-sandboxed content
     // processes, so add it as a target peer.
     if (mProcessType == GeckoProcessType_Content) {
       if (!mSandboxBroker.AddTargetPeer(process)) {
         NS_WARNING("Failed to add content process as target peer.");
       }
     }
+#endif
   }
 
 #else
 #  error Sorry
 #endif
 
   if (!process) {
     MonitorAutoLock lock(mMonitor);