fix: call the original terminate handler even after monitors are disabled #8663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

devunt wants to merge 1 commit into getsentry:main from penxle:fix/cpp-terminate-original-handler

+7 −1

CHANGELOG.md

-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,7 @@ @@
     ### Fixes
+    - Call the original terminate handler even after fatal C++ exception handling disables monitors, instead of aborting with "terminate_handler unexpectedly returned" (#8663)
     - Reduce memory usage when storing envelopes with large attachments (#8649)
     - Fix incorrect `duration` sent for active sessions (#8612)
       - Session `duration` is now set only when the session ends. Active sessions (including on error increments) no longer emit a bogus `duration`.
@@ Expand Down @@

Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_CPPException.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -229,7 +229,7 @@ @@
         // https://en.cppreference.com/w/cpp/error/set_terminate
         if (g_originalTerminateHandler != NULL) {
             SENTRY_ASYNC_SAFE_LOG_DEBUG("Calling original terminate handler.");
             g_originalTerminateHandler();
         }
     }
@@ Expand Down Expand Up / @@ -370,7 +370,12 @@ @@
                 g_originalTerminateHandler = std::set_terminate(CPPExceptionTerminate);
             } else {
                 std::set_terminate(g_originalTerminateHandler);
-                g_originalTerminateHandler = NULL;
+                // Keep g_originalTerminateHandler: CPPExceptionTerminate can still run after the
+                // monitor is disabled, because libc++abi stores the terminate handler per exception
+                // at throw time, and sentrycrashcm_handleException() disables all monitors while
+                // handling a fatal exception. Resetting the handler to NULL here would make
+                // CPPExceptionTerminate return without calling the original handler, causing
+                // libc++abi to abort with "terminate_handler unexpectedly returned".
                 // This method is a no-op if cxa_throw is not swapped.
                 sentrycrashct_unswap_cxa_throw();
@@ Expand Down @@

Uh oh!

Uh oh!

fix: call the original terminate handler even after monitors are disabled #8663

Are you sure you want to change the base?

fix: call the original terminate handler even after monitors are disabled #8663

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

GitHub Actions / Unit macOS 14 Sentry / Unit macOS 14 Sentry

GitHub Actions / Unit macOS 14 Sentry / Unit macOS 14 Sentry

GitHub Actions / Unit macOS 14 Sentry / Unit macOS 14 Sentry

GitHub Actions / Unit macOS 26 Sentry / Unit macOS 26 Sentry

GitHub Actions / Unit macOS 26 Sentry / Unit macOS 26 Sentry

GitHub Actions / Unit macOS 26 Sentry / Unit macOS 26 Sentry

GitHub Actions / Test V10 macOS

GitHub Actions / Test V10 macOS

GitHub Actions / Test V10 macOS

GitHub Actions / Unit macOS 15 Sentry / Unit macOS 15 Sentry

GitHub Actions / Unit macOS 15 Sentry / Unit macOS 15 Sentry

GitHub Actions / Unit macOS 15 Sentry / Unit macOS 15 Sentry

GitHub Actions / Unit tvOS 18 Sentry / Unit tvOS 18 Sentry

GitHub Actions / Unit tvOS 18 Sentry / Unit tvOS 18 Sentry

GitHub Actions / Unit tvOS 18 Sentry / Unit tvOS 18 Sentry

GitHub Actions / Unit Catalyst 14 Sentry / Unit Catalyst 14 Sentry

GitHub Actions / Unit Catalyst 14 Sentry / Unit Catalyst 14 Sentry

GitHub Actions / Unit Catalyst 14 Sentry / Unit Catalyst 14 Sentry

GitHub Actions / Unit tvOS 17 Sentry / Unit tvOS 17 Sentry

GitHub Actions / Unit tvOS 17 Sentry / Unit tvOS 17 Sentry

GitHub Actions / Unit tvOS 17 Sentry / Unit tvOS 17 Sentry

GitHub Actions / Unit iOS 17 Sentry / Unit iOS 17 Sentry

GitHub Actions / Unit iOS 17 Sentry / Unit iOS 17 Sentry

GitHub Actions / Unit iOS 17 Sentry / Unit iOS 17 Sentry

GitHub Actions / Unit iOS 18 Sentry / Unit iOS 18 Sentry

GitHub Actions / Unit iOS 18 Sentry / Unit iOS 18 Sentry

GitHub Actions / Unit iOS 18 Sentry / Unit iOS 18 Sentry

GitHub Actions / Fast Unit Tests (iOS 18) / Unit iOS 18 Sentry

GitHub Actions / Fast Unit Tests (iOS 18) / Unit iOS 18 Sentry

GitHub Actions / Fast Unit Tests (iOS 18) / Unit iOS 18 Sentry

GitHub Actions / Unit Catalyst 15 Sentry / Unit Catalyst 15 Sentry

GitHub Actions / Unit Catalyst 15 Sentry / Unit Catalyst 15 Sentry

GitHub Actions / Unit Catalyst 15 Sentry / Unit Catalyst 15 Sentry

GitHub Actions / Test V10 tvOS

GitHub Actions / Test V10 tvOS

GitHub Actions / Test V10 tvOS

GitHub Actions / Test V10 iOS

GitHub Actions / Test V10 iOS

GitHub Actions / Test V10 iOS

GitHub Actions / Test V10 visionOS

GitHub Actions / Test V10 visionOS

GitHub Actions / Test V10 visionOS

Uh oh!