Bug 1201438 - Fixup for builds with disabled sandbox. a=sledru
authorJacek Caban <jacek@codeweavers.com>
Wed, 09 Sep 2015 14:17:12 +0200
changeset 289239 46cad514f07326ab16d1a0c7e168033370f3f9c3
parent 289238 d3fb09ff0a1af3a319eb5aa650fdd9ecd045b22c
child 289240 bb011b9221d6d9916fe1e61c8c517f73d5a77c08
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssledru
bugs1201438
milestone42.0a2
Bug 1201438 - Fixup for builds with disabled sandbox. a=sledru
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);