marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix possible double close when attempting to open uncompressed files

scancodes-fix
Armin Burgmeier 2012-02-05 20:00:47 +01:00
parent fb27b9c1c3
commit 2092baaa18
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/c4group/CStdFile.cpp
View File

@ -126,6 +126,14 @@ bool CStdFile::Open(const char *szFilename, bool fCompressed)
if(fd == -1) return false;
if (!(hgzFile = c4_gzdopen(fd,"rb"))) { close(fd); return false; }
/* Reject uncompressed files */
if(c4_gzdirect(hgzFile))
{
c4_gzclose(hgzFile);
hgzFile = NULL;
return false;
}
}
else
{

7
src/zlib/gzio.c
View File

@ -208,13 +208,6 @@ local gzFile gz_open (path, mode, fd)
s->start = ftell(s->file) - s->stream.avail_in;
}
/* Reject uncompressed files */
if (s->transparent)
{
gzclose( (gzFile)s );
return (gzFile)Z_NULL;
}
return (gzFile)s;
}