Make sanitizer signal handlers work again.

services/service_manager/embedder/main.cc

 // Copyright 2017 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 "services/service_manager/embedder/main.h"
 
 #include "base/allocator/features.h"
 #include "base/at_exit.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
@@ skipping 90 matching lines @@
 
   MainDelegate* const main_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceProcessLauncherDelegateImpl);
 };
 
 #if defined(OS_POSIX) && !defined(OS_ANDROID)
 
 // Setup signal-handling state: resanitize most signals, ignore SIGPIPE.
 void SetupSignalHandlers() {
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableInProcessStackTraces)) {
+    // Don't interfere with sanitizer signal handlers.
+    return;
+  }
+
   // 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;
   CHECK_EQ(0, sigemptyset(&empty_signal_set));
   CHECK_EQ(0, sigprocmask(SIG_SETMASK, &empty_signal_set, NULL));
 
   struct sigaction sigact;
   memset(&sigact, 0, sizeof(sigact));
   sigact.sa_handler = SIG_DFL;
   static const int signals_to_reset[] = {
@@ skipping 209 matching lines @@
 #if defined(OS_MACOSX) && BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)
   base::allocator::InitializeAllocatorShim();
 #endif
   base::EnableTerminationOnOutOfMemory();
 
 #if defined(OS_WIN)
   base::win::RegisterInvalidParamHandler();
   ui::win::CreateATLModuleIfNeeded();
 #endif  // defined(OS_WIN)
 
-// On Android setlocale() is not supported, and we don't override the signal
-// handlers so we can get a stack trace when crashing.
-#if defined(OS_POSIX) && !defined(OS_ANDROID)
-  // Set C library locale to make sure CommandLine can parse argument values in
-  // the correct encoding.
-  setlocale(LC_ALL, "");
-
-  SetupSignalHandlers();
-#endif
-
 #if !defined(OS_ANDROID)
   // On Android, the command line is initialized when library is loaded.
   int argc = 0;
   const char** argv = nullptr;
 
 #if defined(OS_POSIX)
   // argc/argv are ignored on Windows; see command_line.h for details.
   argc = params.argc;
   argv = params.argv;
 #endif
 
   base::CommandLine::Init(argc, argv);
 
 #if defined(OS_POSIX)
   PopulateFDsFromCommandLine();
 #endif
 
   base::EnableTerminationOnHeapCorruption();
 
   SetProcessTitleFromCommandLine(argv);
 #endif  // !defined(OS_ANDROID)
 
+// On Android setlocale() is not supported, and we don't override the signal
+// handlers so we can get a stack trace when crashing.
+#if defined(OS_POSIX) && !defined(OS_ANDROID)
+  // Set C library locale to make sure CommandLine can parse argument values in
+  // the correct encoding.
+  setlocale(LC_ALL, "");
+
+  SetupSignalHandlers();
+#endif
+
   const auto& command_line = *base::CommandLine::ForCurrentProcess();
 
 #if defined(OS_WIN)
   base::win::SetupCRT(command_line);
 #endif
 
   MainDelegate::InitializeParams init_params;
 
 #if defined(OS_MACOSX)
   // We need this pool for all the objects created before we get to the event
@@ skipping 84 matching lines @@
   autorelease_pool.reset();
 #endif
 
   if (process_type == ProcessType::kEmbedder)
     delegate->ShutDownEmbedderProcess();
 
   return exit_code;
 }
 
 }  // namespace service_manager