[Scummvm-cvs-logs] SF.net SVN: scummvm:[49321] scummvm/trunk/common/unzip.cpp

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Sun May 30 14:45:00 CEST 2010


Revision: 49321
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49321&view=rev
Author:   lordhoto
Date:     2010-05-30 12:44:59 +0000 (Sun, 30 May 2010)

Log Message:
-----------
Fix file length of zip file members inside ZipArchive (thanks to fuzzie for reporting).

Modified Paths:
--------------
    scummvm/trunk/common/unzip.cpp

Modified: scummvm/trunk/common/unzip.cpp
===================================================================
--- scummvm/trunk/common/unzip.cpp	2010-05-30 10:27:39 UTC (rev 49320)
+++ scummvm/trunk/common/unzip.cpp	2010-05-30 12:44:59 UTC (rev 49321)
@@ -1433,11 +1433,11 @@
 	unz_file_info fileInfo;
 	unzOpenCurrentFile(_zipFile);
 	unzGetCurrentFileInfo(_zipFile, &fileInfo, NULL, 0, NULL, 0, NULL, 0);
-	byte *buffer = (byte *)calloc(fileInfo.uncompressed_size+1, 1);
+	byte *buffer = (byte *)malloc(fileInfo.uncompressed_size);
 	assert(buffer);
 	unzReadCurrentFile(_zipFile, buffer, fileInfo.uncompressed_size);
 	unzCloseCurrentFile(_zipFile);
-	return new Common::MemoryReadStream(buffer, fileInfo.uncompressed_size+1, DisposeAfterUse::YES);
+	return new Common::MemoryReadStream(buffer, fileInfo.uncompressed_size, DisposeAfterUse::YES);
 
 	// FIXME: instead of reading all into a memory stream, we could
 	// instead create a new ZipStream class. But then we have to be


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list