NaCl: Permit using the debug exception handler when the debug stub is enabled

chrome/browser/nacl_host/nacl_process_host.cc

 // 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.
 
 #include "chrome/browser/nacl_host/nacl_process_host.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 110 matching lines @@
 #elif defined(OS_LINUX)
       wait_for_nacl_gdb_(false),
 #endif
       reply_msg_(NULL),
 #if defined(OS_WIN)
       debug_exception_handler_requested_(false),
 #endif
       internal_(new NaClInternal()),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
       enable_exception_handling_(false),
+      enable_debug_stub_(false),
       off_the_record_(off_the_record) {
   process_.reset(content::BrowserChildProcessHost::Create(
       content::PROCESS_TYPE_NACL_LOADER, this));
 
   // Set the display name so the user knows what plugin the process is running.
   // We aren't on the UI thread so getting the pref locale for language
   // formatting isn't possible, so IDN will be lost, but this is probably OK
   // for this use case.
   process_->SetName(net::FormatUrl(manifest_url_, std::string()));
 
   // We allow untrusted hardware exception handling to be enabled via
   // an env var for consistency with the standalone build of NaCl.
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableNaClExceptionHandling) ||
       getenv("NACL_UNTRUSTED_EXCEPTION_HANDLING") != NULL) {
     enable_exception_handling_ = true;
   }
+  enable_debug_stub_ = CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableNaClDebug);
 
   enable_ipc_proxy_ = CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableNaClIPCProxy);
 }
 
 NaClProcessHost::~NaClProcessHost() {
   int exit_code;
   process_->GetTerminationStatus(&exit_code);
   std::string message =
       base::StringPrintf("NaCl process exited with status %i (0x%x)",
@@ skipping 457 matching lines @@
 }
 
 bool NaClProcessHost::StartNaClExecution() {
   NaClBrowser* nacl_browser = NaClBrowser::GetInstance();
 
   nacl::NaClStartParams params;
   params.validation_cache_enabled = nacl_browser->ValidationCacheIsEnabled();
   params.validation_cache_key = nacl_browser->GetValidationCacheKey();
   params.version = chrome::VersionInfo().CreateVersionString();
   params.enable_exception_handling = enable_exception_handling_;
-  params.enable_debug_stub =
-      CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableNaClDebug);
+  params.enable_debug_stub = enable_debug_stub_;
   params.enable_ipc_proxy = enable_ipc_proxy_;
 
   base::PlatformFile irt_file = nacl_browser->IrtFile();
   CHECK_NE(irt_file, base::kInvalidPlatformFileValue);
 
   const ChildProcessData& data = process_->GetData();
   for (size_t i = 0; i < internal_->sockets_for_sel_ldr.size(); i++) {
     if (!ShareHandleToSelLdr(data.handle,
                              internal_->sockets_for_sel_ldr[i], true,
                              &params.handles)) {
@@ skipping 91 matching lines @@
   if (!AttachDebugExceptionHandler(info, reply_msg)) {
     // Send failure message.
     NaClProcessMsg_AttachDebugExceptionHandler::WriteReplyParams(reply_msg,
                                                                  false);
     Send(reply_msg);
   }
 }
 
 bool NaClProcessHost::AttachDebugExceptionHandler(const std::string& info,
                                                   IPC::Message* reply_msg) {
-  if (!enable_exception_handling_) {
+  if (!enable_exception_handling_ && !enable_debug_stub_) {
     DLOG(ERROR) <<
-        "Exception handling requested by NaCl process when not enabled";
+        "Debug exception handler requested by NaCl process when not enabled";
     return false;
   }
   if (debug_exception_handler_requested_) {
     // The NaCl process should not request this multiple times.
     DLOG(ERROR) << "Multiple AttachDebugExceptionHandler requests received";
     return false;
   }
   debug_exception_handler_requested_ = true;
 
   base::ProcessId nacl_pid = base::GetProcId(process_->GetData().handle);
@@ skipping 31 matching lines @@
   } else {
     NaClStartDebugExceptionHandlerThread(
         process_handle.Take(), info,
         base::MessageLoopProxy::current(),
         base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker,
                    weak_factory_.GetWeakPtr()));
     return true;
   }
 }
 #endif