NaCl repo side changes to make crash reporting more reliable.

src/trusted/service_runtime/sel_main_chrome.c

 /*
  * Copyright (c) 2011 The Native Client 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 "native_client/src/include/portability.h"
 #include "native_client/src/include/portability_io.h"
 
 #if NACL_OSX
@@ skipping 87 matching lines @@
   (*NACL_VTBL(Gio, gio_desc)->Dtor)(gio_desc);
 }
 
 void NaClMainForChromium(int handle_count, const NaClHandle *handles,
                          int debug) {
   char *av[1];
   int ac = 1;
   const char **envp;
   struct NaClApp state;
   int export_addr_to = kSrpcFd; /* Used to be set by -X. */
-  struct NaClApp *nap;
-  NaClErrorCode errcode;
+  struct NaClApp *nap = &state;
+  NaClErrorCode errcode = LOAD_INTERNAL;
   int ret_code = 1;
   struct NaClEnvCleanser env_cleanser;
   int skip_qualification;
 
 #if NACL_OSX
   /* Mac dynamic libraries cannot access the environ variable directly. */
   envp = (const char **) *_NSGetEnviron();
 #else
   /* Overzealous code style check is overzealous. */
   /* @IGNORE_LINES_FOR_CODE_HYGIENE[1] */
   extern char **environ;
   envp = (const char **) environ;
 #endif
 
   NaClAllModulesInit();
 
   /* to be passed to NaClMain, eventually... */
   av[0] = "NaClMain";
 
   if (!NaClAppCtor(&state)) {
     fprintf(stderr, "Error while constructing app state\n");
-    goto done;
+    goto done_ctor;
   }
 
-  nap = &state;
   errcode = LOAD_OK;
 
   NaClAppInitialDescriptorHookup(nap);
 
   /*
    * NACL_SERVICE_PORT_DESCRIPTOR and NACL_SERVICE_ADDRESS_DESCRIPTOR
    * are 3 and 4.
    */
 
   /* import IMC handle - used to be "-i" */
@@ skipping 145 matching lines @@
   /*
    * exit_group or equiv kills any still running threads while module
    * addr space is still valid.  otherwise we'd have to kill threads
    * before we clean up the address space.
    */
   NaClExit(ret_code);
 
  done:
   fflush(stdout);
 
+  /*
+   * If there is a secure command channel, we sent an RPC reply with
+   * the reason that the nexe was rejected.  If we exit now, that
+   * reply may still be in-flight and the various channel closure (esp
+   * reverse channel) may be detected first.  This would result in a
+   * crash being reported, rather than the error in the RPC reply.
+   * Instead, we wait for the hard-shutdown on the command channel.
+   */
+  if (LOAD_OK != errcode) {
+    NaClBlockIfCommandChannelExists(nap);
+  }
+
+ done_ctor:
+
   NaClAllModulesFini();
 
   NaClExit(ret_code);
 }