Merge pull request #392 from fungl164/osx-live

redmunds · redmunds · commit 801c9232ef41 · 2013-12-03T11:55:24.000-08:00
Fix browser launch params variable assignment before freeing memory
diff --git a/appshell/appshell_extensions_mac.mm b/appshell/appshell_extensions_mac.mm
@@ -1418,10 +1418,11 @@ int32 GetArgvFromProcessID(int pid, NSString **argv)
         goto ERROR_B;
     }
 
+    *argv = [NSString stringWithCString:sp encoding:NSUTF8StringEncoding];
+
     /* Clean up. */
     free(procargs);
 
-    *argv = [NSString stringWithCString:sp encoding:NSUTF8StringEncoding];
     return NO_ERROR;
 
 ERROR_B:
