mirror/psxrecomp
1
0
Fork 0
mirror of https://github.com/RetroPortingToolKit/psxrecomp synced 2026-10-26 02:11:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #650 from RetroPortingToolKit/fix/debug-savestate-slot-range

Browse Source 
debug server: name an out-of-range savestate slot
This commit is contained in:
Matt Stanley
2026-10-12 23:35:48 -07:00
committed by GitHub
parent bb066b70d0 7dc8fdde9a
commit 1f51d7e617
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/src/debug_server.c
+7
View File
@@ -19,6 +19,7 @@
#include "debug_server.h"
#include "host_launch_timing.h"
#include "host_sampler.h"
#include "savestate.h"
#include "guest_cycle_profile.h"
#include "host_osd.h"
#include "psx_video_timing.h"
@@ -9472,6 +9473,12 @@ static void handle_savestate(int id, const char *json)
extern int psx_netplay_request_load(int slot);
int slot = json_get_int(json, "slot", -1);
if (slot < 0) { send_err(id, "missing slot"); return; }
if (slot >= SAVESTATE_SLOTS) {
/* Name the real reason: the generic refusal below blamed LLE runs. */
send_fmt("{\"id\":%d,\"ok\":false,\"error\":\"slot %d out of range (0..%d)\"}",
id, slot, SAVESTATE_SLOTS - 1);
return;
}
char op[16];
if (!json_get_str(json, "op", op, sizeof(op))) { send_err(id, "missing op"); return; }
int staged;
runtime/tests/test_savestate_status_protocol.py
+7
View File
@@ -46,3 +46,10 @@ assert "(resume_pc == 0u && !pc_matches_cpu) || !snapshot_safe || !pc_ok" in STA
assert "!psx_irq_resume_context_snapshot_safe_at(pc) || !resume_pc_ok(pc)" in REWIND
assert "psx_check_interrupts_at(cpu, pc)" in DIRTY
print("savestate status protocol guard passed")
# The debug server names an out-of-range slot instead of the generic refusal.
_handler = SERVER[SERVER.index("static void handle_savestate(int id"):]
_handler = _handler[:_handler.index("\n}\n")]
assert "slot >= SAVESTATE_SLOTS" in _handler
assert _handler.index("slot >= SAVESTATE_SLOTS") < _handler.index("savestate_request_save(slot)")
assert "out of range (0..%d)" in _handler