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

- Bah, you, GCC.

Browse source 
- Forgot to remove the _heapchk() calls.



SVN r3691 (trunk)
This commit is contained in:
Randy Heit 2012-06-16 04:28:23 +00:00
parent 661e33f364
commit 6e5c048df8
4 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/farchive.cpp
View file

@ -402,14 +402,11 @@ void FCompressedFile::Explode ()
uLong newlen; uLong newlen;
newlen = expandsize; newlen = expandsize;
_heapchk();
r = uncompress (expand, &newlen, m_Buffer + 8, cprlen); r = uncompress (expand, &newlen, m_Buffer + 8, cprlen);
if (r != Z_OK || newlen != expandsize) if (r != Z_OK || newlen != expandsize)
{ {
_heapchk();
M_Free (expand); M_Free (expand);
_heapchk(); I_Error ("Could not decompress buffer: %s", M_ZLibError(r).GetChars());
I_Error ("Could not decompress buffer: %s", M_ZLibError(r));
} }
} }
else else

2
src/files.cpp
View file

@ -224,7 +224,7 @@ FileReaderZ::FileReaderZ (FileReader &file, bool zip)
if (err != Z_OK) if (err != Z_OK)
{ {
I_Error ("FileReaderZ: inflateInit failed: %s\n", M_ZLibError(err)); I_Error ("FileReaderZ: inflateInit failed: %s\n", M_ZLibError(err).GetChars());
} }
} }

2
src/g_game.cpp
View file

@ -2513,7 +2513,7 @@ bool G_ProcessIFFDemo (char *mapname)
int r = uncompress (uncompressed, &uncompSize, demo_p, uLong(zdembodyend - demo_p)); int r = uncompress (uncompressed, &uncompSize, demo_p, uLong(zdembodyend - demo_p));
if (r != Z_OK) if (r != Z_OK)
{ {
Printf ("Could not decompress demo! %s\n", M_ZLibError(r)); Printf ("Could not decompress demo! %s\n", M_ZLibError(r).GetChars());
delete[] uncompressed; delete[] uncompressed;
return true; return true;
} }

2
src/i_net.cpp
View file

@ -303,7 +303,7 @@ void PacketGet (void)
// Printf("recv %d/%lu\n", c, msgsize + 1); // Printf("recv %d/%lu\n", c, msgsize + 1);
if (err != Z_OK) if (err != Z_OK)
{ {
Printf("Net decompression failed (zlib error %s)\n", M_ZLibError(err)); Printf("Net decompression failed (zlib error %s)\n", M_ZLibError(err).GetChars());
// Pretend no packet // Pretend no packet
doomcom.remotenode = -1; doomcom.remotenode = -1;
return; return;