react-native-windows 0.69.21 → 0.69.22

package/Microsoft.ReactNative/ReactHost/CrashManager.cpp

@@ -5,6 +5,7 @@
 #include "ReactInstanceWin.h"
 
 #include <winrt/Windows.Storage.h>
+#include <csignal>
 
 #include <WerApi.h>
 
@@ -14,7 +15,7 @@ namespace Mso::React {
 // That should be saved so that if needed it can be called after the new unhandled exception has finished executing.
 // This allows the Windows Error Reporting system to process the error and upload the data for processing.
 static LPTOP_LEVEL_EXCEPTION_FILTER g_previousExceptionFilter = nullptr;
-
+static _crt_signal_t g_previousSignalHandler = SIG_ERR;
 static std::wstring g_logFileName;
 static bool g_WERExceptionFilterWasCalled{false}; // Prevent recursion in the custom handler
 
@@ -29,9 +30,18 @@ extern "C" LONG WINAPI CustomWERExceptionFilter(LPEXCEPTION_POINTERS const excep
 
   CrashManager::OnUnhandledException();
 
+  if (exceptionPointers == nullptr) {
+    return EXCEPTION_EXECUTE_HANDLER;
+  }
+
   return g_previousExceptionFilter(exceptionPointers);
 }
 
+void __cdecl on_sigabrt(int signum) {
+  CustomWERExceptionFilter(nullptr);
+  signal(signum, SIG_DFL);
+}
+
 void InternalRegisterCustomHandler() noexcept {
   // Do this now because by the time we catch the exception we may be in OOM
 #ifndef CORE_ABI // win32 vs uwp file permissions
@@ -47,6 +57,8 @@ void InternalRegisterCustomHandler() noexcept {
   VerifySucceededElseCrash(::WerRegisterFile(g_logFileName.c_str(), WerRegFileTypeOther, WER_FILE_ANONYMOUS_DATA));
 
   g_previousExceptionFilter = ::SetUnhandledExceptionFilter(CustomWERExceptionFilter);
+
+  g_previousSignalHandler = signal(SIGABRT, &on_sigabrt);
 }
 
 void InternalUnregisterCustomHandler() noexcept {
@@ -56,6 +68,10 @@ void InternalUnregisterCustomHandler() noexcept {
     ::SetUnhandledExceptionFilter(g_previousExceptionFilter);
     g_previousExceptionFilter = nullptr;
   }
+
+  if (g_previousSignalHandler != SIG_ERR) {
+    signal(SIGABRT, g_previousSignalHandler);
+  }
 }
 
 /*static*/ void CrashManager::OnUnhandledException() noexcept {

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp

@@ -426,6 +426,7 @@ void ReactInstanceWin::Initialize() noexcept {
 
           devSettings->waitingForDebuggerCallback = GetWaitingForDebuggerCallback();
           devSettings->debuggerAttachCallback = GetDebuggerAttachCallback();
+          devSettings->enableDefaultCrashHandler = m_options.EnableDefaultCrashHandler();
 
 #ifndef CORE_ABI
           devSettings->showDevMenuCallback = [weakThis]() noexcept {

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.69.21</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.69.22</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>69</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>21</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>22</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>8ef868f2a3a532524b086dfb427ea314ec8988e5</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>81b0dc4a3af48f114aea78419f7a9605f4d4e39c</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.69.21",
+  "version": "0.69.22",
   "license": "MIT",
   "repository": {
     "type": "git",