Allow exception forwarding to the system’s native crash reporter to be disabled

handler/mac/crash_report_exception_handler.cc

 // Copyright 2015 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 98 matching lines @@
     return KERN_FAILURE;
   }
 
   ScopedTaskSuspend suspend(task);
 
   ProcessSnapshotMac process_snapshot;
   if (!process_snapshot.Initialize(task)) {
     return KERN_FAILURE;
   }
 
-  if (!process_snapshot.InitializeException(thread,
-                                            exception,
-                                            code,
-                                            code_count,
-                                            *flavor,
-                                            old_state,
-                                            old_state_count)) {
-    return KERN_FAILURE;
+  CrashpadInfo::TriState enable_crashpad_handler;
+  CrashpadInfo::TriState enable_native_crash_reporter_forwarding;
+  process_snapshot.GetCrashpadOptions(&enable_crashpad_handler,
+                                      &enable_native_crash_reporter_forwarding);
+
+  if (enable_crashpad_handler != CrashpadInfo::kDisabled) {
+    if (!process_snapshot.InitializeException(thread,
+                                              exception,
+                                              code,
+                                              code_count,
+                                              *flavor,
+                                              old_state,
+                                              old_state_count)) {
+      return KERN_FAILURE;
+    }
+
+    process_snapshot.SetAnnotationsSimpleMap(*process_annotations_);
+
+    CrashReportDatabase::NewReport* new_report;
+    CrashReportDatabase::OperationStatus database_status =
+        database_->PrepareNewCrashReport(&new_report);
+    if (database_status != CrashReportDatabase::kNoError) {
+      return KERN_FAILURE;
+    }
+
+    CallErrorWritingCrashReport call_error_writing_crash_report(database_,
+                                                                new_report);
+
+    WeakFileHandleFileWriter file_writer(new_report->handle);
+
+    MinidumpFileWriter minidump;
+    minidump.InitializeFromSnapshot(&process_snapshot);
+    if (!minidump.WriteEverything(&file_writer)) {
+      return KERN_FAILURE;
+    }
+
+    call_error_writing_crash_report.Disarm();
+
+    UUID uuid;
+    database_status = database_->FinishedWritingCrashReport(new_report, &uuid);
+    if (database_status != CrashReportDatabase::kNoError) {
+      return KERN_FAILURE;
+    }
+
+    upload_thread_->ReportPending();
   }
 
-  process_snapshot.SetAnnotationsSimpleMap(*process_annotations_);
-
-  CrashReportDatabase::NewReport* new_report;
-  CrashReportDatabase::OperationStatus database_status =
-      database_->PrepareNewCrashReport(&new_report);
-  if (database_status != CrashReportDatabase::kNoError) {
-    return KERN_FAILURE;
-  }
-
-  CallErrorWritingCrashReport call_error_writing_crash_report(database_,
-                                                              new_report);
-
-  WeakFileHandleFileWriter file_writer(new_report->handle);
-
-  MinidumpFileWriter minidump;
-  minidump.InitializeFromSnapshot(&process_snapshot);
-  if (!minidump.WriteEverything(&file_writer)) {
-    return KERN_FAILURE;
-  }
-
-  call_error_writing_crash_report.Disarm();
-
-  UUID uuid;
-  database_status = database_->FinishedWritingCrashReport(new_report, &uuid);
-  if (database_status != CrashReportDatabase::kNoError) {
-    return KERN_FAILURE;
-  }
-
-  upload_thread_->ReportPending();
-
-  if (exception == EXC_CRASH ||
-      exception == EXC_RESOURCE ||
-      exception == EXC_GUARD) {
+  if (enable_native_crash_reporter_forwarding != CrashpadInfo::kDisabled &&
+      (exception == EXC_CRASH ||
+       exception == EXC_RESOURCE ||
+       exception == EXC_GUARD)) {
     // Don’t forward simulated exceptions such as kMachExceptionSimulated to the
     // system crash reporter. Only forward the types of exceptions that it would
     // receive under normal conditions. Although the system crash reporter is
     // able to deal with other exceptions including simulated ones, forwarding
     // them to the system crash reporter could present the system’s crash UI for
     // processes that haven’t actually crashed, and could result in reports not
     // actually associated with crashes being sent to the operating system
     // vendor.
     mach_port_t system_crash_reporter_port;
     const char kSystemCrashReporterServiceName[] = "com.apple.ReportCrash";
@@ skipping 35 matching lines @@
           &new_state_forward_count);
       MACH_LOG_IF(WARNING, kr != KERN_SUCCESS, kr)
           << "UniversalExceptionRaise " << kSystemCrashReporterServiceName;
     }
   }
 
   return ExcServerSuccessfulReturnValue(behavior, false);
 }
 
 }  // namespace crashpad