[Scummvm-cvs-logs] CVS: scummvm/saga sprite.cpp,1.62,1.63

Eugene Sandulenko sev at users.sourceforge.net
Fri Aug 12 03:58:17 CEST 2005


Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30975

Modified Files:
	sprite.cpp 
Log Message:
Fix bug #1257309 "ITE: Invalid read during startup"


Index: sprite.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sprite.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- sprite.cpp	7 Aug 2005 00:00:43 -0000	1.62
+++ sprite.cpp	12 Aug 2005 10:55:17 -0000	1.63
@@ -69,7 +69,7 @@
 	uint16 newSpriteCount;
 	uint16 spriteCount;
 	int i;
-	int outputLength;
+	int outputLength, inputLength;
 	uint32 offset;
 	const byte *spritePointer;
 	const byte *spriteDataPointer;
@@ -125,7 +125,8 @@
 		}
 		spriteDataPointer = spritePointer + readS2.pos();
 		outputLength = spriteInfo->width * spriteInfo->height;
-		decodeRLEBuffer(spriteDataPointer, 64000, outputLength); //todo: 64000 - should be replace by real input length
+		inputLength = spriteListLength - (spriteDataPointer -  spriteListData);
+		decodeRLEBuffer(spriteDataPointer, inputLength, outputLength);
 		spriteInfo->decodedBuffer = (byte *) malloc(outputLength);
 		if (spriteInfo->decodedBuffer == NULL) {
 			memoryError("Sprite::loadList");





More information about the Scummvm-git-logs mailing list