From 043034c8dced50b17cd02253c31789c1e7279c6d Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 2 May 2026 18:55:21 +0000
Subject: [PATCH 1/2] plan: add g_dumpWritten to crash_handler.cpp to prevent
 duplicate dumps

Agent-Logs-Url: https://github.com/winnerspiros/osu/sessions/ec8eb5f9-a370-4c4b-b106-2a543b35f72f

Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 4 ++--
 osu.iOS.props            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 27f5f0067442..07bb54aff5ef 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -99,7 +99,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2026.502.1" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2026.502.3" />
     <!-- `ppy.osu.Framework.NativeLibs` is a transitive dependency of `ppy.osu.Framework`
          that ships desktop-only natives (Linux/macOS/Windows) under `runtimes/<rid>/native/`
          — including a bare Linux `libbass.so`/`libbass_fx.so`/`libbassmix.so` for linux-arm64.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 2ebe8967a80a..37bc51af9b3f 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -38,10 +38,10 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="20.1.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2026.502.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2026.502.3" />
     <!--
       Explicitly pin `ppy.Veldrid.SPIRV` to the winnerspiros fork build that
-      `ppy.osu.Framework 2026.502.1` was compiled against. This version is the only
+      `ppy.osu.Framework 2026.502.3` was compiled against. This version is the only
       one whose `runtimes/android-arm64/native/libveldrid-spirv.so` is aligned to 16 KB
       pages (required by Android 16+). It lives only as a release asset on
       <https://github.com/winnerspiros/veldrid-spirv/releases/tag/1.0> and is vendored
diff --git a/osu.iOS.props b/osu.iOS.props
index 058ad713ea9c..f3ec8f79ffd8 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -33,6 +33,6 @@
     <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2026.502.1" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2026.502.3" />
   </ItemGroup>
 </Project>

From bddb5d9241d7be82ced7489a8cedf0709d592878 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 2 May 2026 18:57:50 +0000
Subject: [PATCH 2/2] fix(crash_handler): add g_dumpWritten latch to prevent
 duplicate SIGSEGV dumps on repeated handler invocation

Agent-Logs-Url: https://github.com/winnerspiros/osu/sessions/ec8eb5f9-a370-4c4b-b106-2a543b35f72f

Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
---
 osu.Android/Native/crash_handler.cpp | 30 ++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/osu.Android/Native/crash_handler.cpp b/osu.Android/Native/crash_handler.cpp
index f6368cc67a29..7b84e40636a7 100644
--- a/osu.Android/Native/crash_handler.cpp
+++ b/osu.Android/Native/crash_handler.cpp
@@ -104,6 +104,14 @@ volatile sig_atomic_t g_installed = 0;
 // the previous handler instead of recursing.
 volatile sig_atomic_t g_inHandler = 0;
 
+// Permanent "dump written" latch.  Set to 1 the first time we successfully
+// begin writing a dump; never reset.  Prevents a second full dump being
+// written if the crash handler is somehow re-invoked in the same process
+// lifetime (e.g. Mono re-raises SIGSEGV via tgkill after our handler chains
+// to it, and our handler gets re-installed between the two deliveries).
+// Unlike g_inHandler this is intentionally NOT cleared before the re-raise.
+volatile sig_atomic_t g_dumpWritten = 0;
+
 // ----------------------------------------------------------------------------
 // Async-signal-safe formatters (no malloc, no stdio, no locale).
 // ----------------------------------------------------------------------------
@@ -983,6 +991,28 @@ static void crashHandler(int sig, siginfo_t* info, void* ucontext) {
     }
     g_inHandler = 1;
 
+    // Duplicate-dump guard.  If we already wrote a dump for this process
+    // lifetime (e.g. the handler was re-invoked after Mono re-raised the
+    // signal), skip the dump but still chain to the previous handler so the
+    // system tombstone is produced.  Unlike g_inHandler this latch is never
+    // cleared — one dump per crash, not one dump per signal delivery.
+    if (g_dumpWritten) {
+        bool restored = false;
+        for (size_t i = 0; i < kNumSignals; ++i) {
+            if (kSignals[i] == sig) {
+                restored = (sigaction(sig, &g_prevHandlers[i], nullptr) == 0);
+                break;
+            }
+        }
+        // If sigaction failed we cannot chain cleanly — fall back to default
+        // disposition so the process at least terminates and debuggerd runs.
+        if (!restored) signal(sig, SIG_DFL);
+        g_inHandler = 0;
+        raise(sig);
+        return;
+    }
+    g_dumpWritten = 1;
+
     // Open the dump file (append).  If g_logPath is empty we still log to logcat.
     //
     // Pre-rotate runaway: if the existing log is more than 4× the soft cap