Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(90)

Unified Diff: src/trusted/service_runtime/sel_main.c

Issue 7942008: NaCl repo side changes to make crash reporting more reliable. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/
Patch Set: '' Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/trusted/service_runtime/sel_ldr.c ('k') | src/trusted/service_runtime/sel_main_chrome.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/trusted/service_runtime/sel_main.c
===================================================================
--- src/trusted/service_runtime/sel_main.c (revision 6725)
+++ src/trusted/service_runtime/sel_main.c (working copy)
@@ -163,7 +163,7 @@
struct NaClApp *nap;
struct GioFile gout;
- NaClErrorCode errcode;
+ NaClErrorCode errcode = LOAD_INTERNAL;
struct GioMemoryFileSnapshot blob_file;
int ret_code;
@@ -856,6 +856,17 @@
PrintVmmap(nap);
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_file_dtor:
if (verbosity > 0) {
« no previous file with comments | « src/trusted/service_runtime/sel_ldr.c ('k') | src/trusted/service_runtime/sel_main_chrome.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698