Fix use-after-free of command line data on Linux/CrOS

content/app/content_main.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/app/content_main.h"
 
 #include "base/at_exit.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
@@ skipping 245 matching lines @@
   // Get the new process type from the new command line.
   std::string process_type =
       command_line.GetSwitchValueASCII(switches::kProcessType);
 
   for (size_t i = 0; i < arraysize(kMainFunctions); ++i) {
     if (process_type == kMainFunctions[i].name)
       return kMainFunctions[i].function(main_params);
   }
 
   if (delegate)
-    return delegate->RunProcess(process_type, main_function_params);
+    return delegate->RunProcess(process_type, main_params);
 
   NOTREACHED() << "Unknown zygote process type: " << process_type;
   return 1;
 }
 #endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
 
 // Run the FooMain() for a given process type.
 // If |process_type| is empty, runs BrowserMain().
 // Returns the exit code for this process.
 int RunNamedProcessTypeMain(const std::string& process_type,
@@ skipping 13 matching lines @@
   for (size_t i = 0; i < arraysize(kMainFunctions); ++i) {
     if (process_type == kMainFunctions[i].name)
       return kMainFunctions[i].function(main_function_params);
   }
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   // Zygote startup is special -- see RunZygote comments above
   // for why we don't use ZygoteMain directly.
   if (process_type == switches::kZygoteProcess)
     return RunZygote(main_function_params, delegate);
+  }

[jam, 2011/09/09 16:49:40]

accident?

[James Cook, 2011/09/09 16:51:08]

Yup, thanks.

 #endif
 
   // If it's a process we don't know about, the embedder should know.
   if (delegate)
     return delegate->RunProcess(process_type, main_function_params);
 
   NOTREACHED() << "Unknown process type: " << process_type;
   return 1;
 }
 
@@ skipping 178 matching lines @@
   _CrtDumpMemoryLeaks();
 #endif  // _CRTDBG_MAP_ALLOC
 
   _Module.Term();
 #endif  // OS_WIN
 
   return exit_code;
 }
 
 }  // namespace content