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

Unified Diff: src/shared/platform/nacl_log.c

Issue 997683002: Exit cleanly for the SRPC "log" requests instead of generating crash reports. (Closed) Base URL: https://chromium.googlesource.com/native_client/src/native_client.git@master
Patch Set: run the hook just in case Created 5 years, 9 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/shared/platform/nacl_log.h ('k') | src/trusted/service_runtime/nacl_error_log_hook.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/shared/platform/nacl_log.c
diff --git a/src/shared/platform/nacl_log.c b/src/shared/platform/nacl_log.c
index 2e6e4d1a7decf65aeb3fcca810b654230c2544e5..5f172a3eca9c7350e7a9948593cd65d45c91ca0d 100644
--- a/src/shared/platform/nacl_log.c
+++ b/src/shared/platform/nacl_log.c
@@ -352,8 +352,9 @@ void NaClLogUnlock(void) {
#ifdef __COVERITY__
NaClAbort(); /* help coverity figure out that this is the default */
#else
- (*gNaClLogAbortBehavior)();
+ NaClLogRunAbortBehavior();
#endif
+ /* The abort behavior hook may not abort, so abort here in case. */
NaClAbort();
}
break;
@@ -716,3 +717,7 @@ void NaClLogSetAbortBehavior(void (*fn)(void)) {
gNaClLogAbortBehavior = fn;
NaClXMutexUnlock(&log_mu);
}
+
+void NaClLogRunAbortBehavior(void) {
+ (*gNaClLogAbortBehavior)();
+}
« no previous file with comments | « src/shared/platform/nacl_log.h ('k') | src/trusted/service_runtime/nacl_error_log_hook.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698