Bug 588911: Initialize gArgc/v earlier in XRE_InitParentProcess(). r=bent a=test-only

toolkit/xre/nsAppRunner.cpp

@@ -470,6 +470,8 @@ static void RemoveArg(char **argv)
 static ArgResult
 CheckArg(const char* aArg, PRBool aCheckOSInt = PR_FALSE, const char **aParam = nsnull, PRBool aRemArg = PR_TRUE)
 {
+  NS_ABORT_IF_FALSE(gArgv, "gArgv must be initialized before CheckArg()");
+
   char **curarg = gArgv + 1; // skip argv[0]
   ArgResult ar = ARG_NONE;
 

toolkit/xre/nsEmbedFunctions.cpp

@@ -492,7 +492,9 @@ XRE_InitParentProcess(int aArgc,
   NS_ENSURE_ARG_POINTER(aArgv);
   NS_ENSURE_ARG_POINTER(aArgv[0]);
 
-  int rv = XRE_InitCommandLine(aArgc, aArgv);
+  gArgc = aArgc;
+  gArgv = aArgv;
+  int rv = XRE_InitCommandLine(gArgc, gArgv);
   if (NS_FAILED(rv))
       return NS_ERROR_FAILURE;