Skip to content

Fix the save loading bug that corrupts saves #7

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
ZivDero merged 2 commits into from
Sep 5, 2026
+15 −6
Merged

Fix the save loading bug that corrupts saves #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f48b74
Fix the save loading bug that corrupts saves
JusticarProgramming Aug 27, 2026
85b3868
Prevent read issues and check all bytes, based on comments by Krisztiaan
JusticarProgramming Sep 4, 2026
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
21 changes: 15 additions & 6 deletions code/savever.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,20 +658,29 @@ HRESULT SaveVersionInfo::Load_String(IStorage *storage, int id, char *string)
return(res);
}

WCHAR buf[128];

@Krisztiaan Krisztiaan Sep 4, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Holds 127 char + terminator, new loop never reads i = 127. A stream where the terminator is there returns S_OK with an empty destination. Handle the full representable range + fail if no terminator is found.

ULONG count;

int i = 0;
while (true) {
WCHAR buf[128];
res = stm->Read(&buf[i], sizeof(buf[i]), NULL);
for (; i < ARRAY_SIZE(buf); i++) {
res = stm->Read(&buf[i], sizeof(buf[i]), &count);
if (FAILED(res)) {
return(res);
}
if (res != S_OK || count != sizeof(buf[i])) {
return(E_FAIL);
}
if (buf[i] == '\0') {
WideCharToMultiByte(CP_ACP, 0, buf, -1, string, ARRAY_SIZE(buf) - 1, 0, 0);
return(res);
break;
}
i++;
}

if (i == ARRAY_SIZE(buf)) {
return(E_FAIL);
}

WideCharToMultiByte(CP_ACP, 0, buf, -1, string, ARRAY_SIZE(buf) - 1, 0, 0);

return(S_OK);
}

Expand Down