Bug 988878. r=bsmedberg, a=lsblakk
authorBen Turner <bent.mozilla@gmail.com>
Fri, 04 Apr 2014 19:45:20 -0700
changeset 192699 d63ea81bafed47e8e56af1bd846ada6903d64091
parent 192698 d3ab72461f9415847800e7e8c391b18e653ec7ca
child 192700 9b8080d562762bd3e85e6525554b79b55460488d
push id474
push userasasaki@mozilla.com
push dateMon, 02 Jun 2014 21:01:02 +0000
treeherdermozilla-release@967f4cf1b31c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg, lsblakk
bugs988878
milestone30.0a2
Bug 988878. r=bsmedberg, a=lsblakk
ipc/glue/ProtocolUtils.cpp
--- a/ipc/glue/ProtocolUtils.cpp
+++ b/ipc/glue/ProtocolUtils.cpp
@@ -184,17 +184,18 @@ FatalError(const char* aProtocolName, co
   nsAutoCString formattedMessage("IPDL error [");
   formattedMessage.AppendASCII(aProtocolName);
   formattedMessage.AppendLiteral("]: \"");
   formattedMessage.AppendASCII(aMsg);
   if (aIsParent) {
     formattedMessage.AppendLiteral("\". Killing child side as a result.");
     NS_ERROR(formattedMessage.get());
 
-    if (!base::KillProcess(aHandle, base::PROCESS_END_KILLED_BY_USER, false)) {
+    if (aHandle != kInvalidProcessHandle &&
+        !base::KillProcess(aHandle, base::PROCESS_END_KILLED_BY_USER, false)) {
       NS_ERROR("May have failed to kill child!");
     }
   } else {
     formattedMessage.AppendLiteral("\". abort()ing as a result.");
     NS_RUNTIMEABORT(formattedMessage.get());
   }
 }