feat: Capturing fatal CPPExceptions via cxa_throw

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Features
+
+- Capturing fatal CPPExceptions via hooking into cxa_throw when enabling `options.experimental.enableUnhandledCPPExceptionsV2 = true` (#5256)
+
 ### Improvements
 
 - Crashes for uncaught NSExceptions will now report the stracktrace recorded within the exception (#5306)

Samples/SentrySampleShared/SentrySampleShared/SentrySDKWrapper.swift

@@ -130,6 +130,7 @@ public struct SentrySDKWrapper {
 
         // Experimental features
         options.experimental.enableFileManagerSwizzling = !SentrySDKOverrides.Other.disableFileManagerSwizzling.boolValue
+        options.experimental.enableUnhandledCPPExceptionsV2 = true
     }
 
     func configureInitialScope(scope: Scope) -> Scope {

Samples/iOS-Swift/iOS-Swift/Base.lproj/Main.storyboard

@@ -890,13 +890,13 @@
                                 </constraints>
                             </view>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="40A-vG-dFA">
-                                <rect key="frame" x="0.0" y="134" width="320" height="268"/>
+                                <rect key="frame" x="0.0" y="134" width="320" height="274.5"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="fn9-mQ-2PY">
-                                        <rect key="frame" x="0.0" y="0.0" width="320" height="140"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="320" height="146.5"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" translatesAutoresizingMaskIntoConstraints="NO" id="Q2k-6Y-RnD">
-                                                <rect key="frame" x="0.0" y="0.0" width="160" height="140"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="160" height="146.5"/>
                                                 <subviews>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NFC-V3-lgW">
                                                         <rect key="frame" x="0.0" y="0.0" width="160" height="28"/>
@@ -907,31 +907,31 @@
                                                         </connections>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Llv-Yz-cwF">
-                                                        <rect key="frame" x="0.0" y="28" width="160" height="28"/>
+                                                        <rect key="frame" x="0.0" y="29.5" width="160" height="28"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                         <state key="normal" title="Capture NSException"/>
                                                         <connections>
                                                             <action selector="captureNSException:" destination="QmU-DD-itF" eventType="touchUpInside" id="Gdl-wk-dUU"/>
                                                         </connections>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wJ4-gS-64G" userLabel="fatalError">
-                                                        <rect key="frame" x="0.0" y="56" width="160" height="28"/>
+                                                        <rect key="frame" x="0.0" y="59.5" width="160" height="28"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                         <state key="normal" title="Throw FatalError"/>
                                                         <connections>
                                                             <action selector="captureFatalError:" destination="QmU-DD-itF" eventType="touchUpInside" id="dM5-xq-lrm"/>
                                                         </connections>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ulu-26-dyP" userLabel="fatalDuplicateKeyError">
-                                                        <rect key="frame" x="0.0" y="84" width="160" height="28"/>
+                                                        <rect key="frame" x="0.0" y="89" width="160" height="28"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                         <state key="normal" title="Fatal Duplicate Key Error"/>
                                                         <connections>
                                                             <action selector="throwFatalDuplicateKeyError:" destination="QmU-DD-itF" eventType="touchUpInside" id="kze-Yw-k8f"/>
                                                         </connections>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NYx-6R-0bb">
-                                                        <rect key="frame" x="0.0" y="112" width="160" height="28"/>
+                                                        <rect key="frame" x="0.0" y="118.5" width="160" height="28"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                         <state key="normal" title="OOM crash"/>
                                                         <connections>
@@ -941,7 +941,7 @@
                                                 </subviews>
                                             </stackView>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" translatesAutoresizingMaskIntoConstraints="NO" id="2CV-VI-MDY">
-                                                <rect key="frame" x="160" y="0.0" width="160" height="140"/>
+                                                <rect key="frame" x="160" y="0.0" width="160" height="146.5"/>
                                                 <subviews>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zbo-2T-1Zm">
                                                         <rect key="frame" x="0.0" y="0.0" width="160" height="28"/>
@@ -953,24 +953,33 @@
                                                         </connections>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="s6w-E3-5yE" userLabel="DiskWriteException">
-                                                        <rect key="frame" x="0.0" y="35" width="160" height="28"/>
+                                                        <rect key="frame" x="0.0" y="28" width="160" height="28"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                         <state key="normal" title="DiskWriteException"/>
                                                         <connections>
                                                             <action selector="diskWriteException:" destination="QmU-DD-itF" eventType="touchUpInside" id="p74-qC-kH7"/>
                                                         </connections>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NNd-Ec-zXw">
-                                                        <rect key="frame" x="0.0" y="70.5" width="160" height="28"/>
+                                                        <rect key="frame" x="0.0" y="56" width="160" height="28"/>
                                                         <accessibility key="accessibilityConfiguration" label="crashTheApp"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                         <state key="normal" title="Crash the app"/>
                                                         <connections>
                                                             <action selector="crash:" destination="QmU-DD-itF" eventType="touchUpInside" id="qlZ-bL-KUT"/>
                                                         </connections>
                                                     </button>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ptW-5o-Xrh" userLabel="Unhandled C++ Exception">
+                                                        <rect key="frame" x="0.0" y="84" width="160" height="28"/>
+                                                        <accessibility key="accessibilityConfiguration" label="crashTheApp"/>
+                                                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                                        <state key="normal" title="Unhandled C++ Exception"/>
+                                                        <connections>
+                                                            <action selector="unhandledCppException:" destination="QmU-DD-itF" eventType="touchUpInside" id="T1y-uf-e08"/>
+                                                        </connections>
+                                                    </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wJs-Av-cg2">
-                                                        <rect key="frame" x="0.0" y="105.5" width="160" height="34.5"/>
+                                                        <rect key="frame" x="0.0" y="112" width="160" height="34.5"/>
                                                         <state key="normal" title="Button"/>
                                                         <buttonConfiguration key="configuration" style="plain" title="Use-after-free"/>
                                                         <connections>
@@ -982,7 +991,7 @@
                                         </subviews>
                                     </stackView>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="1zm-ho-TCr">
-                                        <rect key="frame" x="0.0" y="140" width="320" height="128"/>
+                                        <rect key="frame" x="0.0" y="146.5" width="320" height="128"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="128" id="lc6-97-p3W"/>
                                         </constraints>
@@ -1172,7 +1181,7 @@
                                                                 <rect key="frame" x="0.0" y="336" width="152" height="38"/>
                                                                 <subviews>
                                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" adjustsImageSizeForAccessibilityContentSizeCategory="YES" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YhG-k9-4vd">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="76" height="38"/>
+                                                                        <rect key="frame" x="0.0" y="0.0" width="78" height="38"/>
                                                                         <accessibility key="accessibilityConfiguration" identifier="io.sentry.ui-test.button.show-widget"/>
                                                                         <state key="normal" title="Button"/>
                                                                         <buttonConfiguration key="configuration" style="plain" title="Show Widget">
@@ -1183,7 +1192,7 @@
                                                                         </connections>
                                                                     </button>
                                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" adjustsImageSizeForAccessibilityContentSizeCategory="YES" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fqi-kr-TkL">
-                                                                        <rect key="frame" x="76" y="0.0" width="76" height="38"/>
+                                                                        <rect key="frame" x="78" y="0.0" width="74" height="38"/>
                                                                         <accessibility key="accessibilityConfiguration" identifier="io.sentry.ui-test.button.hide-widget"/>
                                                                         <state key="normal" title="Button"/>
                                                                         <buttonConfiguration key="configuration" style="plain" title="Hide Widget">

Samples/iOS-Swift/iOS-Swift/ErrorsViewController.swift

@@ -55,6 +55,11 @@ class ErrorsViewController: UIViewController {
         }
     }
 
+    @IBAction func unhandledCppException(_ sender: Any) {
+        let cpp = CppWrapper()
+        cpp.throwCPPException()
+    }
+
     // swiftlint:disable force_unwrapping
     @IBAction func unwrapCrash(_ sender: UIButton) {
         highlightButton(sender)

Samples/iOS-Swift/iOS-Swift/Tools/CppCode.cpp

@@ -0,0 +1,8 @@
+#include "CppCode.hpp"
+#include <stdexcept>
+
+void
+Sentry::CppCode::throwCPPException(void)
+{
+    throw std::invalid_argument("Invalid Argument.");
+}

Samples/iOS-Swift/iOS-Swift/Tools/CppCode.hpp

@@ -0,0 +1,15 @@
+#ifndef CppCode_h
+#define CppCode_h
+#if defined __cplusplus
+
+#    include <stdio.h>
+
+namespace Sentry {
+class CppCode {
+public:
+    void throwCPPException();
+};
+}
+
+#endif /* __cplusplus */
+#endif /* CppSample_hpp */

Samples/iOS-Swift/iOS-Swift/Tools/CppWrapper.h

@@ -0,0 +1,5 @@
+#import <Foundation/Foundation.h>
+
+@interface CppWrapper : NSObject
+- (void)throwCPPException;
+@end

Samples/iOS-Swift/iOS-Swift/Tools/CppWrapper.mm

@@ -0,0 +1,13 @@
+#import "CppWrapper.h"
+#import "CppCode.hpp"
+#import <Foundation/Foundation.h>
+
+@implementation CppWrapper
+
+- (void)throwCPPException
+{
+    Sentry::CppCode cpp;
+    cpp.throwCPPException();
+}
+
+@end

Samples/iOS-Swift/iOS-Swift/Tools/iOS-Swift-Bridging-Header.h

@@ -1,3 +1,4 @@
+#import "CppWrapper.h"
 #import "SentryBenchmarking.h"
 #import "SentryExposure.h"
 #import <Sentry/PrivateSentrySDKOnly.h>