1
0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 18:59:09 +00:00

Fix zlib inout variables to not crash things

This commit is contained in:
Branan Purvine-Riley
2011-10-29 18:46:29 -07:00
parent 7dd9b30452
commit e8b6c424d7

View File

@ -46,20 +46,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
hsBool plZlibCompress::Uncompress(UInt8* bufOut, UInt32* bufLenOut, const UInt8* bufIn, UInt32 bufLenIn) hsBool plZlibCompress::Uncompress(UInt8* bufOut, UInt32* bufLenOut, const UInt8* bufIn, UInt32 bufLenIn)
{ {
unsigned long buflen_out; unsigned long buflen_out = *bufLenOut;
bool result = (uncompress(bufOut, &buflen_out, bufIn, bufLenIn) == Z_OK); bool result = (uncompress(bufOut, &buflen_out, bufIn, bufLenIn) == Z_OK);
*bufLenOut = buflen_out; *bufLenOut = buflen_out;
return result; return result;
} }
hsBool plZlibCompress::Compress(UInt8* bufOut, UInt32* bufLenOut, const UInt8* bufIn, UInt32 bufLenIn) hsBool plZlibCompress::Compress(UInt8* bufOut, UInt32* bufLenOut, const UInt8* bufIn, UInt32 bufLenIn)
{ {
// according to compress doc, the bufOut buffer should be at least .1% larger than source buffer, plus 12 bytes. // according to compress doc, the bufOut buffer should be at least .1% larger than source buffer, plus 12 bytes.
hsAssert(*bufLenOut>=(int)(bufLenIn*1.1+12), "bufOut compress buffer is not large enough"); hsAssert(*bufLenOut>=(int)(bufLenIn*1.1+12), "bufOut compress buffer is not large enough");
unsigned long buflen_out; unsigned long buflen_out = *bufLenOut;
bool result = (compress(bufOut, &buflen_out, bufIn, bufLenIn) == Z_OK); bool result = (compress(bufOut, &buflen_out, bufIn, bufLenIn) == Z_OK);
*bufLenOut = buflen_out; *bufLenOut = buflen_out;
return result; return result;
} }
// //