Merge remote-tracking branch 'upstream/master' into jpnurmi/fix/sa-nodefer-chain-at-start

Author: jpnurmi

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 **Fixes**:
 
+- inproc: only the handling thread cleans up after the crash. ([#1579](https://github.com/getsentry/sentry-native/pull/1579))
 - Fix `CHAIN_AT_START` handler strategy crashing on Android when the chained Mono handler resets the signal handler and re-raises. ([#1572](https://github.com/getsentry/sentry-native/pull/1572))
 
 ## 0.13.2

Makefile

@@ -60,16 +60,17 @@ setup-git: $(GIT_COMMON_DIR)/hooks/pre-commit
 	git submodule update --init --recursive
 .PHONY: setup-git
 
-setup-venv: .venv/bin/python
+setup-venv: .venv/.stamp
 .PHONY: setup-venv
 
 $(GIT_COMMON_DIR)/hooks/pre-commit:
 	@cd $(GIT_COMMON_DIR)/hooks && ln -sf $(PWD)/scripts/git-precommit-hook.sh pre-commit
 
-.venv/bin/python: Makefile tests/requirements.txt
+.venv/.stamp: Makefile tests/requirements.txt
 	@rm -rf .venv
 	python3 -m venv .venv
 	.venv/bin/pip install --upgrade --requirement tests/requirements.txt
+	@touch $@
 
 format: setup-venv
 	@.venv/bin/clang-format -i \

README.md

@@ -66,9 +66,8 @@ The SDK currently supports and is tested on the following OS/Compiler variations
 - x64 Linux with GCC 9
 - x64/arm64 Linux with clang 19
 - x86 Linux with GCC 9 (cross compiled from x64 host)
-- x86 Windows with MSVC 2019
-- x64 Windows with MSVC 2022
-- macOS 13, 14, 15 with respective most recent Apple compiler toolchain and LLVM clang 15 + 18
+- x86, x64 and arm64 Windows with MSVC 2022
+- macOS 13, 14, 15, 26 with respective most recent Apple compiler toolchain and LLVM clang 15 + 18
 - Android API35 built by NDK27 toolchain
 - Android API16 built by NDK19 toolchain
 - PlayStation via [sentry-playstation](https://github.com/getsentry/sentry-playstation). See [PlayStation documentation](https://docs.sentry.io/platforms/playstation/) to get access.

src/backends/sentry_backend_inproc.c

@@ -1354,7 +1354,7 @@ has_handler_thread_crashed(void)
     return false;
 }
 
-static void
+static bool
 dispatch_ucontext(const sentry_ucontext_t *uctx,
     const struct signal_slot *sig_slot, int handler_depth)
 {
@@ -1368,7 +1368,7 @@ dispatch_ucontext(const sentry_ucontext_t *uctx,
     // Disable stdio-based logging - not safe in signal handler context.
     sentry__logger_disable();
     process_ucontext_deferred(uctx, sig_slot, skip_hooks);
-    return;
+    return true;
 #else
     if (has_handler_thread_crashed()) {
         // Disable stdio-based logging since we're now in signal handler context
@@ -1380,7 +1380,7 @@ dispatch_ucontext(const sentry_ucontext_t *uctx,
         // Always skip hooks here since the first attempt (from handler thread)
         // already failed, likely due to a crashing hook.
         process_ucontext_deferred(uctx, sig_slot, true);
-        return;
+        return true;
     }
 
     // Try to become the crash handler. Only one thread can transition
@@ -1401,15 +1401,15 @@ dispatch_ucontext(const sentry_ucontext_t *uctx,
             sentry__cpu_relax();
         }
         // State is now DONE: just return and let the signal propagate
-        return;
+        return false;
     }
 
     // We are the first handler. Check if handler thread is available.
     if (!sentry__atomic_fetch(&g_handler_thread_ready)) {
         // Disable stdio-based logging - not safe in signal handler context.
         sentry__logger_disable();
         process_ucontext_deferred(uctx, sig_slot, skip_hooks);
-        return;
+        return true;
     }
 
     g_handler_state.uctx = *uctx;
@@ -1463,7 +1463,7 @@ dispatch_ucontext(const sentry_ucontext_t *uctx,
         int depth = sentry__enter_signal_handler();
         if (depth >= 3) {
             // Multiple recursive crashes - bail out
-            return;
+            return true;
         }
         // Disable stdio-based logging - not safe in signal handler context.
         sentry__logger_disable();
@@ -1472,7 +1472,7 @@ dispatch_ucontext(const sentry_ucontext_t *uctx,
         // always 1, which would incorrectly re-run hooks on a recursive
         // crash where the pipe also fails.
         process_ucontext_deferred(uctx, sig_slot, skip_hooks);
-        return;
+        return true;
     }
 #    elif defined(SENTRY_PLATFORM_WINDOWS)
     if (g_handler_semaphore) {
@@ -1489,7 +1489,7 @@ dispatch_ucontext(const sentry_ucontext_t *uctx,
         // Disable stdio-based logging - not safe in signal handler context.
         sentry__logger_disable();
         process_ucontext_deferred(uctx, sig_slot, skip_hooks);
-        return;
+        return true;
     }
 #    endif
 
@@ -1519,6 +1519,7 @@ dispatch_ucontext(const sentry_ucontext_t *uctx,
     (void)!sentry__enter_signal_handler();
 #    endif
 
+    return true;
 #endif
 }
 
@@ -1661,11 +1662,18 @@ process_ucontext(const sentry_ucontext_t *uctx)
 
     // invoke the handler thread for signal unsafe actions
 #ifdef SENTRY_PLATFORM_UNIX
-    dispatch_ucontext(uctx, sig_slot, handler_depth);
+    bool is_handling_thread = dispatch_ucontext(uctx, sig_slot, handler_depth);
 #else
-    dispatch_ucontext(uctx, sig_slot, 1);
+    bool is_handling_thread = dispatch_ucontext(uctx, sig_slot, 1);
 #endif
 
+    // Non-handling threads (that lost the CAS race) should just return.
+    // Signal handlers are already reset by the handling thread, so
+    // re-executing the crashing instruction will hit the default handler.
+    if (!is_handling_thread) {
+        return;
+    }
+
 #ifdef SENTRY_PLATFORM_UNIX
 cleanup:
     // reset signal handlers and invoke the original ones.  This will then tear

tests/conftest.py

@@ -7,7 +7,6 @@
 from . import run
 from .cmake import CMake
 
-
 LABEL = "label"
 TIME_UNIT = "time_unit"
 REAL_TIME = "real_time"

tests/requirements.txt

@@ -1,4 +1,4 @@
-black==24.3.0
+black==26.3.1
 pytest==8.1.1
 pytest-httpserver==1.0.10
 flaky==3.8.1

tests/test_integration_native.py

@@ -22,7 +22,6 @@
 )
 from .conditions import has_native, is_kcov, is_asan
 
-
 pytestmark = pytest.mark.skipif(
     not has_native,
     reason="Tests need the native backend enabled",