From 99080fa9fb194331c812ecb7ccd53ac1e6782701 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Fri, 8 Aug 2014 17:55:22 -0700
Subject: [PATCH] Bug 1045847 - Fix review comments

---
 ipc/contentproc/plugin-container.cpp | 3 ++-
 toolkit/xre/nsEmbedFunctions.cpp     | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ipc/contentproc/plugin-container.cpp b/ipc/contentproc/plugin-container.cpp
index f01fdd9cfcbd..5dc6736a4571 100644
--- a/ipc/contentproc/plugin-container.cpp
+++ b/ipc/contentproc/plugin-container.cpp
@@ -85,8 +85,9 @@ content_process_main(int argc, char* argv[])
 {
     // Check for the absolute minimum number of args we need to move
     // forward here. We expect the last arg to be the child process type.
-    if (argc < 1)
+    if (argc < 1) {
       return 3;
+    }
     XRE_SetProcessType(argv[--argc]);
 
     bool isNuwa = false;
diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp
index d2b2e633952d..e616748994b3 100644
--- a/toolkit/xre/nsEmbedFunctions.cpp
+++ b/toolkit/xre/nsEmbedFunctions.cpp
@@ -213,6 +213,12 @@ GeckoProcessType sChildProcessType = GeckoProcessType_Default;
 void
 XRE_SetProcessType(const char* aProcessTypeString)
 {
+  static bool called = false;
+  if (called) {
+    MOZ_CRASH();
+  }
+  called = true;
+
   sChildProcessType = GeckoProcessType_Invalid;
   for (int i = 0;
        i < (int) ArrayLength(kGeckoProcessTypeString);