Fix memory leak when errors happens in NaClProcessHost::Launch. Allow Launch to

chrome/browser/nacl_host/nacl_process_host.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_
 #define CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_
 #pragma once
 
 #include "build/build_config.h"
 
@@ skipping 19 matching lines @@
 // After that, most of the communication is directly between NaCl plugin
 // running in the renderer and NaCl processes.
 class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
  public:
   explicit NaClProcessHost(const std::wstring& url);
   virtual ~NaClProcessHost();
 
   // Do any minimal work that must be done at browser startup.
   static void EarlyStartup();
 
   // Initialize the new NaCl process, returning true on success. On success,

[Mark Seaborn, 2012/03/21 20:41:29]

Update the comment.  Launch() no longer returns true on success.  Remove the 'On
success'/'On failure' parts.

[halyavin, 2012/03/22 08:35:47]

Done.

   // the NaCl process host will assume responsibility for sending the reply
   // message. On failure, the reply will not be sent and this is the caller's
   // responsibility to avoid hanging the renderer.
-  bool Launch(ChromeRenderMessageFilter* chrome_render_message_filter,
+  void Launch(ChromeRenderMessageFilter* chrome_render_message_filter,
               int socket_count,
               IPC::Message* reply_msg);
 
   virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
 
   void OnProcessLaunchedByBroker(base::ProcessHandle handle);
 
  private:
   // Internal class that holds the nacl::Handle objecs so that
   // nacl_process_host.h doesn't include NaCl headers.  Needed since it's
   // included by src\content, which can't depend on the NaCl gyp file because it
   // depends on chrome.gyp (circular dependency).
   struct NaClInternal;
 
   // Create command line for launching loader under nacl-gdb.
   scoped_ptr<CommandLine> LaunchWithNaClGdb(const FilePath& nacl_gdb,
                                             CommandLine* line);
   bool LaunchSelLdr();
 
   // BrowserChildProcessHostDelegate implementation:
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
   virtual void OnProcessCrashed(int exit_code) OVERRIDE;
   virtual void OnProcessLaunched() OVERRIDE;
 
   void IrtReady();
   void SendStart(base::PlatformFile irt_file);
 
+  // Send message to the renderer that NaCl failed to load.
+  void SendNaClLaunchError();
+
   bool IsHardwareExceptionHandlingEnabled();
 
  private:
 #if defined(OS_WIN)
   class DebugContext;
 
   scoped_refptr<DebugContext> debug_context_;
+
+  // This field becames true when the broker successfully launched

[Mark Seaborn, 2012/03/21 20:41:29]

'becomes'.  Actually the comment is rather unnecessary since the variable name
is descriptive enough.

[halyavin, 2012/03/22 08:35:47]

Done.

+  // the NaCl loader.
+  bool process_launched_by_broker_;
 #endif
   // The ChromeRenderMessageFilter that requested this NaCl process.  We use
   // this for sending the reply once the process has started.
   scoped_refptr<ChromeRenderMessageFilter> chrome_render_message_filter_;
 
   // The reply message to send. We must always send this message when the
   // sub-process either succeeds or fails to unblock the renderer waiting for
   // the reply. NULL when there is no reply to send.
   IPC::Message* reply_msg_;
 
   // Socket pairs for the NaCl process and renderer.
   scoped_ptr<NaClInternal> internal_;
 
   base::WeakPtrFactory<NaClProcessHost> weak_factory_;
 
   scoped_ptr<content::BrowserChildProcessHost> process_;
 
   DISALLOW_COPY_AND_ASSIGN(NaClProcessHost);
 };
 
 #endif  // CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_