Skip to content

ignore and remove invalid stats.txt files #867

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

Open
fabiangreffrath wants to merge 1 commit into
base: master
Choose a base branch
from
+27 −28
Open

ignore and remove invalid stats.txt files #867

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
55 changes: 27 additions & 28 deletions prboom2/src/dsda/wad_stats.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,34 +162,33 @@ static void dsda_LoadWadStats(void) {
lines = dsda_SplitString(buffer, "\n\r");

if (lines) {
if (!lines[0] || !lines[1])
I_Error("Encountered invalid wad stats: %s", path);

if (sscanf(lines[0], "%d", &version) != 1)
I_Error("Encountered invalid wad stats: %s", path);

if (version > current_version)
I_Error("Encountered unsupported wad stats version: %s", path);

if (sscanf(lines[1], "%d", &wad_stats.total_kills) != 1)
I_Error("Encountered invalid wad stats: %s", path);

for (i = 2; lines[i] && *lines[i]; ++i) {
map_stats_t ms;

if (
sscanf(
lines[i], "%8s %d %d %d %d %d %d %d %d %d %d %d %d %d %d",
ms.lump, &ms.episode, &ms.map,
&ms.best_skill, &ms.best_time, &ms.best_max_time, &ms.best_nm_time,
&ms.total_exits, &ms.total_kills,
&ms.best_kills, &ms.best_items, &ms.best_secrets,
&ms.max_kills, &ms.max_items, &ms.max_secrets
) == 15
) {
map_count += 1;
dsda_EnsureMapCount(map_count);
wad_stats.maps[map_count - 1] = ms;
if (
!lines[0] || !lines[1] ||
sscanf(lines[0], "%d", &version) != 1 ||
version > current_version ||
sscanf(lines[1], "%d", &wad_stats.total_kills) != 1
) {
lprintf(LO_WARN, "Encountered invalid wad stats: %s", path);
M_remove(path);
}
else {
for (i = 2; lines[i] && *lines[i]; ++i) {
map_stats_t ms;

if (
sscanf(
lines[i], "%8s %d %d %d %d %d %d %d %d %d %d %d %d %d %d",
ms.lump, &ms.episode, &ms.map,
&ms.best_skill, &ms.best_time, &ms.best_max_time, &ms.best_nm_time,
&ms.total_exits, &ms.total_kills,
&ms.best_kills, &ms.best_items, &ms.best_secrets,
&ms.max_kills, &ms.max_items, &ms.max_secrets
) == 15
) {
map_count += 1;
dsda_EnsureMapCount(map_count);
wad_stats.maps[map_count - 1] = ms;
}
}
}

Expand Down
Loading