[Scummvm-cvs-logs] SF.net SVN: scummvm:[36124] scummvm/branches/branch-0-13-0/engines/tucker/ tucker.cpp

cyx at users.sourceforge.net cyx at users.sourceforge.net
Wed Jan 28 22:49:39 CET 2009


Revision: 36124
          http://scummvm.svn.sourceforge.net/scummvm/?rev=36124&view=rev
Author:   cyx
Date:     2009-01-28 21:49:38 +0000 (Wed, 28 Jan 2009)

Log Message:
-----------
backport 36123: fix #2543067 'crash on Bud Tucker in Double Trouble german version', don't copy rect if w or h <= 0

Modified Paths:
--------------
    scummvm/branches/branch-0-13-0/engines/tucker/tucker.cpp

Modified: scummvm/branches/branch-0-13-0/engines/tucker/tucker.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/tucker/tucker.cpp	2009-01-28 21:43:26 UTC (rev 36123)
+++ scummvm/branches/branch-0-13-0/engines/tucker/tucker.cpp	2009-01-28 21:49:38 UTC (rev 36124)
@@ -3822,7 +3822,12 @@
 		r.clip(clip);
 		const uint8 *src = _locationBackgroundGfxBuf + r.top * 640 + r.left;
 		r.translate(-clip.left, -clip.top);
-		_system->copyRectToScreen(src, 640, r.left, r.top, r.right - r.left, r.bottom - r.top);
+		const int w = r.right - r.left;
+		const int h = r.bottom - r.top;
+		if (w <= 0 || h <= 0) {
+			return;
+		}
+		_system->copyRectToScreen(src, 640, r.left, r.top, w, h);
 	}
 }
 


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