zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-02-07 07:21:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: FResourceFile::OpenResourceFile did not close the opened file in case it contained invalid data.

Browse source
This commit is contained in:
Christoph Oelckers 2017-01-21 20:15:06 +01:00
parent 06ad2351d3
commit aaae52c60b
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/resourcefiles/resourcefile.cpp
View file

@ -291,11 +291,13 @@ static CheckFunc funcs[] = { CheckWad, CheckZip, Check7Z, CheckPak, CheckGRP, Ch
FResourceFile *FResourceFile::OpenResourceFile(const char *filename, FileReader *file, bool quiet, bool containeronly) FResourceFile *FResourceFile::OpenResourceFile(const char *filename, FileReader *file, bool quiet, bool containeronly)
{ {
bool mustclose = false;
if (file == NULL) if (file == NULL)
{ {
try try
{ {
file = new FileReader(filename); file = new FileReader(filename);
mustclose = true;
} }
catch (CRecoverableError &) catch (CRecoverableError &)
{ {
@ -307,6 +309,7 @@ FResourceFile *FResourceFile::OpenResourceFile(const char *filename, FileReader
FResourceFile *resfile = funcs[i](filename, file, quiet); FResourceFile *resfile = funcs[i](filename, file, quiet);
if (resfile != NULL) return resfile; if (resfile != NULL) return resfile;
} }
if (mustclose) delete file;
return NULL; return NULL;
} }