stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-10 23:31:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make sure handles of files opened by W_LoadWadFile are closed if we abort loading the files for whatever reason.

Browse source 
ESPECIALLY if the file is already loaded in SRB2, that's just silly.
This commit is contained in:
Monster Iestyn 2018-11-02 20:48:12 +00:00
parent ba5f5be3bb
commit 0f37411e2b
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/w_wad.c
View file

@ -381,6 +381,8 @@ UINT16 W_LoadWadFile(const char *filename)
if (fread(&header, 1, sizeof header, handle) < sizeof header) if (fread(&header, 1, sizeof header, handle) < sizeof header)
{ {
CONS_Alert(CONS_ERROR, M_GetText("Can't read wad header from %s because %s\n"), filename, strerror(ferror(handle))); CONS_Alert(CONS_ERROR, M_GetText("Can't read wad header from %s because %s\n"), filename, strerror(ferror(handle)));
if (handle)
fclose(handle);
return INT16_MAX; return INT16_MAX;
} }
@ -391,6 +393,8 @@ UINT16 W_LoadWadFile(const char *filename)
&& memcmp(header.identification, "SDLL", 4) != 0) && memcmp(header.identification, "SDLL", 4) != 0)
{ {
CONS_Alert(CONS_ERROR, M_GetText("%s does not have a valid WAD header\n"), filename); CONS_Alert(CONS_ERROR, M_GetText("%s does not have a valid WAD header\n"), filename);
if (handle)
fclose(handle);
return INT16_MAX; return INT16_MAX;
} }
@ -405,6 +409,8 @@ UINT16 W_LoadWadFile(const char *filename)
{ {
CONS_Alert(CONS_ERROR, M_GetText("Wadfile directory in %s is corrupted (%s)\n"), filename, strerror(ferror(handle))); CONS_Alert(CONS_ERROR, M_GetText("Wadfile directory in %s is corrupted (%s)\n"), filename, strerror(ferror(handle)));
free(fileinfov); free(fileinfov);
if (handle)
fclose(handle);
return INT16_MAX; return INT16_MAX;
} }
@ -462,6 +468,8 @@ UINT16 W_LoadWadFile(const char *filename)
if (!memcmp(wadfiles[i]->md5sum, md5sum, 16)) if (!memcmp(wadfiles[i]->md5sum, md5sum, 16))
{ {
CONS_Alert(CONS_ERROR, M_GetText("%s is already loaded\n"), filename); CONS_Alert(CONS_ERROR, M_GetText("%s is already loaded\n"), filename);
if (handle)
fclose(handle);
return INT16_MAX; return INT16_MAX;
} }
} }