From aae628ae077affbf67728cd585b320ed3dc64175 Mon Sep 17 00:00:00 2001
From: Irastris <irastris15@gmail.com>
Date: Tue, 31 Mar 2026 04:33:08 -0400
Subject: [PATCH] Prevent some array lookups in c_cc_d and c_math from going
 out of bounds

---
 src/SSystem/SComponent/c_cc_d.cpp | 15 +++++++++++++++
 src/SSystem/SComponent/c_math.cpp |  3 +++
 2 files changed, 18 insertions(+)

diff --git a/src/SSystem/SComponent/c_cc_d.cpp b/src/SSystem/SComponent/c_cc_d.cpp
index 569d64e5e7..d77e155adc 100644
--- a/src/SSystem/SComponent/c_cc_d.cpp
+++ b/src/SSystem/SComponent/c_cc_d.cpp
@@ -65,9 +65,14 @@ void cCcD_DivideArea::CalcDivideInfo(cCcD_DivideInfo* pDivideInfo, const cM3dGAa
         if (!mXDiffIsZero) {
             s32 var1 = mInvScaledXDiff * (aab.GetMinP()->x - GetMinP()->x);
             s32 var3 = mInvScaledXDiff * (aab.GetMaxP()->x - GetMinP()->x);
+#if TARGET_PC
+            var1 = var1 < 0 ? 0 : var1 > 31 ? 31 : var1;
+            var3 = var3 < 0 ? 0 : var3 > 31 ? 31 : var3;
+#else
             if (31 < var3) {
                 var3 = 31;
             }
+#endif
 
             xDivInfo = l_base[var3];
             if (0 < var1) {
@@ -81,9 +86,14 @@ void cCcD_DivideArea::CalcDivideInfo(cCcD_DivideInfo* pDivideInfo, const cM3dGAa
         if (!mYDiffIsZero) {
             s32 var1 = mInvScaledYDiff * (aab.GetMinP()->y - GetMinP()->y);
             s32 var3 = mInvScaledYDiff * (aab.GetMaxP()->y - GetMinP()->y);
+#if TARGET_PC
+            var1 = var1 < 0 ? 0 : var1 > 31 ? 31 : var1;
+            var3 = var3 < 0 ? 0 : var3 > 31 ? 31 : var3;
+#else
             if (31 < var3) {
                 var3 = 31;
             }
+#endif
 
             yDivInfo = l_base[var3];
             if (0 < var1) {
@@ -97,9 +107,14 @@ void cCcD_DivideArea::CalcDivideInfo(cCcD_DivideInfo* pDivideInfo, const cM3dGAa
         if (!mZDiffIsZero) {
             s32 var1 = mInvScaledZDiff * (aab.GetMinP()->z - GetMinP()->z);
             s32 var3 = mInvScaledZDiff * (aab.GetMaxP()->z - GetMinP()->z);
+#if TARGET_PC
+            var1 = var1 < 0 ? 0 : var1 > 31 ? 31 : var1;
+            var3 = var3 < 0 ? 0 : var3 > 31 ? 31 : var3;
+#else
             if (31 < var3) {
                 var3 = 31;
             }
+#endif
 
             zDivInfo = l_base[var3];
             if (0 < var1) {
diff --git a/src/SSystem/SComponent/c_math.cpp b/src/SSystem/SComponent/c_math.cpp
index 2cc54fece9..7a95a46949 100644
--- a/src/SSystem/SComponent/c_math.cpp
+++ b/src/SSystem/SComponent/c_math.cpp
@@ -109,6 +109,9 @@ static u16 atntable[1025] = {
 
 u16 U_GetAtanTable(f32 f0, f32 f1) {
     int idx = f0 / f1 * 0x400;
+#if TARGET_PC
+    idx = idx < 0 ? 0 : idx > 0x400 ? 0x400 : idx;
+#endif
     return atntable[idx];
 }