[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.465,2.466

Gregory Montoir cyx at users.sourceforge.net
Wed Aug 10 15:16:04 CEST 2005


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

Modified Files:
	gfx.cpp 
Log Message:
clip the 'top' argument in Gdi::resetBackground (as we do for bottom), this is safer and should prevent crashes when loading savegames with 'invalid' coordinates for the actors. See also bug #1252714.

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.465
retrieving revision 2.466
diff -u -d -r2.465 -r2.466
--- gfx.cpp	6 Aug 2005 14:34:39 -0000	2.465
+++ gfx.cpp	10 Aug 2005 22:13:55 -0000	2.466
@@ -1727,7 +1727,10 @@
 	byte *backbuff_ptr, *bgbak_ptr;
 	int numLinesToProcess;
 
-	if (bottom >= vs->h)
+	if (top < 0)
+		top = 0;
+
+	if (bottom > vs->h)
 		bottom = vs->h;
 
 	if (top >= bottom)





More information about the Scummvm-git-logs mailing list