Skip to content

fix(web): restore empty checkpoint variable names #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xxxsen merged 1 commit into from
Aug 31, 2026
Merged

fix(web): restore empty checkpoint variable names #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/runner.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5062,7 +5062,9 @@ static bool restoreCheckpointVariables(VMContext* vm, Instance* target, const Js
if (!JsonReader_isObject(object)) return false;
repeat(JsonReader_objectLength(object), i) {
const char* name = JsonReader_getJsonKeyByIndex(object, i);
if (name == nullptr || name[0] == '\0') return false;
// Some GameMaker VARI chunks contain an empty name for a real variable ID.
// Checkpoint v2 already writes that name as a valid empty JSON object key.
if (name == nullptr) return false;
RValue value = RValue_makeUndefined();
if (!checkpointRValueFromJson(vm, JsonReader_getJsonValueByIndex(object, i), 0, remainingCells, &value)) return false;
Instance_setSelfVar(target, VM_getOrAllocateVarID(vm, name), value);
Expand Down
9 changes: 9 additions & 0 deletions tests/test_retrom_web_host.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,15 @@ def test_checkpoint_v2_preserves_supported_game_data_structures(self) -> None:
self.assertIn("writeUint32LE(gCheckpointBytes + 4, 2);", self.source)
self.assertIn("readUint32LE(bytes + 4) != 2", self.source)

def test_checkpoint_v2_restores_empty_game_variable_names(self) -> None:
runner = (ROOT / "src/runner.c").read_text(encoding="utf-8")
start = runner.index("static bool restoreCheckpointVariables")
end = runner.index("static void clearCheckpointInstances", start)
restore = runner[start:end]
self.assertIn("name == nullptr", restore)
self.assertNotIn("name[0] == '\\0'", restore)
self.assertIn("VM_getOrAllocateVarID(vm, name)", restore)

def test_closing_a_dirty_ini_clears_the_transient_checkpoint_blocker(self) -> None:
start = self.builtins.index("static RValue builtin_ini_close")
end = self.builtins.index("static RValue builtin_ini_read_string", start)
Expand Down
Loading