From 7e239ae2ae2289aea7576d4af7beb3874fac24b5 Mon Sep 17 00:00:00 2001
From: Rosalie Wanders <rosalie@mailbox.org>
Date: Thu, 25 Jan 2024 21:08:00 +0100
Subject: [PATCH] 3rdParty: update mupen64plus-core

---
 Source/3rdParty/mupen64plus-core/.gitrepo     |  4 ++--
 .../mupen64plus-core/data/mupen64plus.ini     | 22 +++++++++++++++++++
 .../mupen64plus-core/src/api/frontend.c       |  3 ++-
 .../device/r4300/new_dynarec/new_dynarec.c    |  2 +-
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/Source/3rdParty/mupen64plus-core/.gitrepo b/Source/3rdParty/mupen64plus-core/.gitrepo
index d56d9b68..5991f0ba 100644
--- a/Source/3rdParty/mupen64plus-core/.gitrepo
+++ b/Source/3rdParty/mupen64plus-core/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = git@github.com:mupen64plus/mupen64plus-core.git
 	branch = master
-	commit = 20615a1264382f981cbc022225966980fc456d49
-	parent = e68f2b91cd93c8fb4c86734a6f749e0318d5687b
+	commit = 860fac3fbae94194a392c1d9857e185eda6d083e
+	parent = 84681fdd0d326e400524c422f182f7fa60e6493f
 	method = merge
 	cmdver = 0.4.6
diff --git a/Source/3rdParty/mupen64plus-core/data/mupen64plus.ini b/Source/3rdParty/mupen64plus-core/data/mupen64plus.ini
index c8a384ba..d9aaf760 100644
--- a/Source/3rdParty/mupen64plus-core/data/mupen64plus.ini
+++ b/Source/3rdParty/mupen64plus-core/data/mupen64plus.ini
@@ -5128,6 +5128,11 @@ SaveType=SRAM
 Players=4
 Rumble=Yes
 
+[20F5EEEE849DB44146AAFB1B97A857F6]
+GoodName=F-ZERO X (U) [T+Por0.99_byftr]
+CRC=485256FF CF6DF912
+RefMD5=753437D0D8ADA1D12F3F9CF0F0A5171F
+
 [3AE32658B839FFA3189E3CA84E0B884A]
 GoodName=F-ZERO X (U) [f1] (Sex V1.0 Hack)
 CRC=7E399849 03DAC1CD
@@ -5830,6 +5835,11 @@ Players=4
 Mempak=Yes
 Rumble=Yes
 
+[0AC7A16F8AFCC03031835C89D095D7B9]
+GoodName=Getter Love!! (J) [T+Eng1.01_ozidual]
+CRC=CDDB4BDF 84E5EFAC
+RefMD5=5270D98F9E67DC7EF354ECE109C2A18F
+
 [3BE170E7E94A03BD4E36732EB137EE39]
 GoodName=Getter Love!! (J) [b1]
 CRC=489C84E6 4C6E49F9
@@ -6132,6 +6142,13 @@ GoodName=GoldenEye X
 CRC=E8B3F63D E5A997B1
 RefMD5=E03B088B6AC9E0080440EFED07C1E40F
 
+[EA0E3E6AEFA58738A12906298373218B]
+GoodName=GoldenEye 007 (UE) (Switch Online) [!]
+CRC=DCBC50D1 9FD1AA3
+Players=4
+SaveType=Eeprom 4KB
+Rumble=Yes
+
 [9B8A7541D0234F4D97004ECBC216D9C2]
 GoodName=HIPTHRUST by MooglyGuy (PD)
 CRC=88A12FB3 8A583CBD
@@ -6243,6 +6260,11 @@ GoodName=Heiwa Pachinko World 64 (J) [!]
 CRC=3E70E866 4438BAE8
 Players=1
 
+[78E2ED1DB5F90E2EA9C04771B27685BC]
+GoodName=Heiwa Pachinko World 64 (J) [T+Eng1.0_Zoinkity]
+CRC=3AE679E2 1A3C42DB
+RefMD5=5E8539E037EEA88C5A2746F60E431C8D
+
 [9D0D85E3A0C94B98D6404E8FC28E7B01]
 GoodName=Heiwa Pachinko World 64 (J) [b1]
 CRC=3E70E866 4438BAE8
diff --git a/Source/3rdParty/mupen64plus-core/src/api/frontend.c b/Source/3rdParty/mupen64plus-core/src/api/frontend.c
index f2f8c04f..6f2d267b 100644
--- a/Source/3rdParty/mupen64plus-core/src/api/frontend.c
+++ b/Source/3rdParty/mupen64plus-core/src/api/frontend.c
@@ -180,7 +180,8 @@ EXPORT m64p_error CALL CoreDoCommand(m64p_command Command, int ParamInt, void *P
         case M64CMD_ROM_OPEN:
             if (g_EmulatorRunning || l_DiskOpen || l_ROMOpen)
                 return M64ERR_INVALID_STATE;
-            if (ParamPtr == NULL || ParamInt < 4096)
+            // ROM buffer size must be divisible by 4 to avoid out-of-bounds read in swap_copy_rom (v64/n64 formats)
+            if (ParamPtr == NULL || ParamInt < 4096 || ParamInt > CART_ROM_MAX_SIZE || ParamInt % 4 != 0)
                 return M64ERR_INPUT_ASSERT;
             rval = open_rom((const unsigned char *) ParamPtr, ParamInt);
             if (rval == M64ERR_SUCCESS)
diff --git a/Source/3rdParty/mupen64plus-core/src/device/r4300/new_dynarec/new_dynarec.c b/Source/3rdParty/mupen64plus-core/src/device/r4300/new_dynarec/new_dynarec.c
index 445e3be2..dca53aa6 100644
--- a/Source/3rdParty/mupen64plus-core/src/device/r4300/new_dynarec/new_dynarec.c
+++ b/Source/3rdParty/mupen64plus-core/src/device/r4300/new_dynarec/new_dynarec.c
@@ -22,10 +22,10 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h> // needed for u_int, u_char, etc
 #include <assert.h>
 
 #if defined(__APPLE__)
-#include <sys/types.h> // needed for u_int, u_char, etc
 #define MAP_ANONYMOUS MAP_ANON
 #endif