[Scummvm-cvs-logs] CVS: scummvm/sky disk.cpp,1.57,1.58

Joost Peters joostp at users.sourceforge.net
Thu Aug 19 04:18:28 CEST 2004


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

Modified Files:
	disk.cpp 
Log Message:
Fix potential OOB read


Index: disk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- disk.cpp	27 Jun 2004 22:14:33 -0000	1.57
+++ disk.cpp	19 Aug 2004 11:16:55 -0000	1.58
@@ -124,11 +124,11 @@
 		return NULL;
 	}
 
-	_fileFlags = READ_LE_UINT32((filePtr + 5));
+	_fileFlags = READ_LE_UINT24(filePtr + 5);
 	_fileSize = _fileFlags & 0x03fffff;
 	_lastLoadedFileSize = _fileSize;
 	
-	_fileOffset = READ_LE_UINT32((filePtr + 2)) & 0x0ffffff;
+	_fileOffset = READ_LE_UINT32(filePtr + 2) & 0x0ffffff;
 
 	cflag = (uint8)((_fileOffset >> 23) & 0x1);
 	_fileOffset &= 0x7FFFFF;





More information about the Scummvm-git-logs mailing list