Don’t trigger EXC_CORPSE_NOTIFY on OS X 10.11

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 107 matching lines @@
     // handler, com.apple.ReportCrash.root, which invokes spindump to handle
     // them. These non-fatal exceptions are never user-visible and are not
     // currently of interest to Crashpad. Returning success here gets the
     // process going again quickly, without generating a crash report.
     //
     // Alternatively, this could return KERN_FAILURE to let the exception go to
     // the host-level handler, but there doesn’t seem to be much value in doing
     // so.
     ExcServerCopyState(
         behavior, old_state, old_state_count, new_state, new_state_count);
-    return ExcServerSuccessfulReturnValue(behavior, false);
+    return ExcServerSuccessfulReturnValue(exception, behavior, false);
   }
 
   CrashpadInfoClientOptions client_options;
   process_snapshot.GetCrashpadOptions(&client_options);
 
   if (client_options.crashpad_handler_behavior != TriState::kDisabled) {
     if (!process_snapshot.InitializeException(behavior,
                                               thread,
                                               exception,
                                               code,
@@ skipping 40 matching lines @@
 
     UUID uuid;
     database_status = database_->FinishedWritingCrashReport(new_report, &uuid);
     if (database_status != CrashReportDatabase::kNoError) {
       return KERN_FAILURE;
     }
 
     upload_thread_->ReportPending();
   }
 
-  bool forwarded = false;
   if (client_options.system_crash_reporter_forwarding != TriState::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
@@ skipping 34 matching lines @@
           thread,
           task,
           exception,
           code,
           code_count,
           &flavor_forward,
           old_state,
           old_state_count,
           new_state_forward_count ? &new_state_forward[0] : nullptr,
           &new_state_forward_count);
-      if (kr == KERN_SUCCESS) {
-        forwarded = true;
-      } else {
-        MACH_LOG(WARNING, kr)
-            << "UniversalExceptionRaise " << kSystemCrashReporterServiceName;
-      }
+      MACH_LOG_IF(WARNING, kr != KERN_SUCCESS, kr)
+          << "UniversalExceptionRaise " << kSystemCrashReporterServiceName;
     }
   }
 
-  if (!forwarded) {
-    ExcServerCopyState(
-        behavior, old_state, old_state_count, new_state, new_state_count);
-  }
+  ExcServerCopyState(
+      behavior, old_state, old_state_count, new_state, new_state_count);
 
-  return ExcServerSuccessfulReturnValue(behavior, false);
+  return ExcServerSuccessfulReturnValue(exception, behavior, false);
 }
 
 }  // namespace crashpad