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

Unified Diff: services/service_manager/embedder/main.cc

Issue 2851653002: Make sanitizer signal handlers work again. (Closed)
Patch Set: Created 3 years, 8 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 | « content/browser/zygote_host/zygote_communication_linux.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/service_manager/embedder/main.cc
diff --git a/services/service_manager/embedder/main.cc b/services/service_manager/embedder/main.cc
index c636bd2cef8d2abd36cb635130c4adfbe2e732d1..1312a4d4028c403bd48622577053af25f1f4f2e9 100644
--- a/services/service_manager/embedder/main.cc
+++ b/services/service_manager/embedder/main.cc
@@ -108,6 +108,9 @@ class ServiceProcessLauncherDelegateImpl
// Setup signal-handling state: resanitize most signals, ignore SIGPIPE.
void SetupSignalHandlers() {
+#if !defined(ADDRESS_SANITIZER) && !defined(LEAK_SANITIZER) && \
jam 2017/04/28 00:24:50 can we use the same switch as in content? i..e mov
Oliver Chang 2017/04/28 17:05:06 Done. I put it in service_manager/embedder/switche
jam 2017/05/01 15:37:24 Even content doesn't have these checks, so I don't
Oliver Chang 2017/05/01 16:05:14 Sure, removed.
+ !defined(MEMORY_SANITIZER) && !defined(THREAD_SANITIZER) && \
+ !defined(UNDEFINED_SANITIZER)
// Sanitise our signal handling state. Signals that were ignored by our
// parent will also be ignored by us. We also inherit our parent's sigmask.
sigset_t empty_signal_set;
@@ -126,6 +129,7 @@ void SetupSignalHandlers() {
// Always ignore SIGPIPE. We check the return value of write().
CHECK_NE(SIG_ERR, signal(SIGPIPE, SIG_IGN));
+#endif
}
void PopulateFDsFromCommandLine() {
« no previous file with comments | « content/browser/zygote_host/zygote_communication_linux.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698