From 3bab77b59d9a2474bc0268597d0d582e360eb533 Mon Sep 17 00:00:00 2001
From: PJB3005 <pieterjan.briers+git@gmail.com>
Date: Mon, 16 Mar 2026 16:48:45 +0100
Subject: [PATCH] Fix CUTOFF_TO_IIR_TABLE OOB

---
 libs/JSystem/include/JSystem/JAudio2/JASCalc.h | 4 ++++
 libs/JSystem/src/JAudio2/JASCalc.cpp           | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/libs/JSystem/include/JSystem/JAudio2/JASCalc.h b/libs/JSystem/include/JSystem/JAudio2/JASCalc.h
index bb8054675f..35b8fd5516 100644
--- a/libs/JSystem/include/JSystem/JAudio2/JASCalc.h
+++ b/libs/JSystem/include/JSystem/JAudio2/JASCalc.h
@@ -33,7 +33,11 @@ struct JASCalc {
     f32 fake2(s32 x);
     f32 fake3();
 
+#if AVOID_UB
+    static const s16 CUTOFF_TO_IIR_TABLE[129][4];
+#else
     static const s16 CUTOFF_TO_IIR_TABLE[128][4];
+#endif
 };
 
 template <typename A, typename B>
diff --git a/libs/JSystem/src/JAudio2/JASCalc.cpp b/libs/JSystem/src/JAudio2/JASCalc.cpp
index be87a8aa4e..9ac209c96b 100644
--- a/libs/JSystem/src/JAudio2/JASCalc.cpp
+++ b/libs/JSystem/src/JAudio2/JASCalc.cpp
@@ -132,7 +132,11 @@ void JASCalc::bzero(void* dest, u32 size) {
     }
 }
 
+#if AVOID_UB
+s16 const JASCalc::CUTOFF_TO_IIR_TABLE[129][4] = {
+#else
 s16 const JASCalc::CUTOFF_TO_IIR_TABLE[128][4] = {
+#endif
     0x0F5C, 0x0A3D, 0x4665, 0x1E73,
     0x0F5E, 0x0A3D, 0x4664, 0x1E73,
     0x0F63, 0x0A3C, 0x4661, 0x1E71,
@@ -261,6 +265,10 @@ s16 const JASCalc::CUTOFF_TO_IIR_TABLE[128][4] = {
     0x7C7A, 0x0052, 0x0233, 0x00F4,
     0x7E3B, 0x0029, 0x011B, 0x007A,
     0x7FFF, 0x0000, 0x0000, 0x0000,
+#if AVOID_UB
+    // Game OOB reads this in some cases.
+    0,0,0,0
+#endif
 };
 
 // currently required because of missing functions