[Scummvm-cvs-logs] SF.net SVN: scummvm:[35581] scummvm/trunk/graphics/video/smk_player.cpp

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Sat Dec 27 20:37:49 CET 2008


Revision: 35581
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35581&view=rev
Author:   drmccoy
Date:     2008-12-27 19:37:49 +0000 (Sat, 27 Dec 2008)

Log Message:
-----------
Initializing the lookahead values, too. No more valgrind warnings anymore :)

Modified Paths:
--------------
    scummvm/trunk/graphics/video/smk_player.cpp

Modified: scummvm/trunk/graphics/video/smk_player.cpp
===================================================================
--- scummvm/trunk/graphics/video/smk_player.cpp	2008-12-27 19:30:11 UTC (rev 35580)
+++ scummvm/trunk/graphics/video/smk_player.cpp	2008-12-27 19:37:49 UTC (rev 35581)
@@ -482,8 +482,10 @@
 	Common::Array<byte> huffmanTrees;
 	huffmanTrees.resize(_header.treesSize + 2);
 	_fileStream->read(&huffmanTrees[0], _header.treesSize);
+	huffmanTrees[_header.treesSize] = 0;
+	huffmanTrees[_header.treesSize + 1] = 0;
 
-	BitStream bs(&huffmanTrees[0], _header.treesSize + 2);
+	BitStream bs(&huffmanTrees[0], _header.treesSize);
 
 	_MMapTree = new BigHuffmanTree(bs);
 	_MClrTree = new BigHuffmanTree(bs);
@@ -607,8 +609,10 @@
 
 	_frameData = (byte *)malloc(frameDataSize + 2);
 	_fileStream->read(_frameData, frameDataSize);
+	_frameData[frameDataSize] = 0;
+	_frameData[frameDataSize + 1] = 0;
 
-	BitStream bs(_frameData, frameDataSize + 2);
+	BitStream bs(_frameData, frameDataSize);
 
 	_MMapTree->reset();
 	_MClrTree->reset();
@@ -757,7 +761,7 @@
 void SMKPlayer::queueCompressedBuffer(byte *buffer, uint32 bufferSize,
 		uint32 unpackedSize, int streamNum) {
 
-	BitStream audioBS(buffer, bufferSize + 2);
+	BitStream audioBS(buffer, bufferSize);
 	bool dataPresent = audioBS.getBit();
 
 	if (!dataPresent)


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