[Scummvm-cvs-logs] CVS: scummvm/scumm resource_v7he.cpp,1.51,1.52

kirben kirben at users.sourceforge.net
Thu Jan 5 22:41:01 CET 2006


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

Modified Files:
	resource_v7he.cpp 
Log Message:

Avoid invalid read/writes in createSound() for now.


Index: resource_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v7he.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- resource_v7he.cpp	6 Jan 2006 05:40:40 -0000	1.51
+++ resource_v7he.cpp	6 Jan 2006 06:40:27 -0000	1.52
@@ -1885,6 +1885,11 @@
 
 	debug(0, "SDAT size1 %d size2 %d", size1, size2);
 
+	if (size1 <= 0) {
+		debug(0, "createSound: Invalid offset (%d) for sound (%d)", snd1id, size1);
+		return;
+	}
+
 	if (size2 < size1) {
 		src = sdat2Ptr + 8;
 		dst = sdat1Ptr + 8 + _sndOffs1;





More information about the Scummvm-git-logs mailing list