[Scummvm-cvs-logs] scummvm master -> cebb3e340a5c7ab74e7ea1a34a39c7dab0040022

[m-kiewitz]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
cebb3e340a SCI32: fix crash during gabriel knight intro


Commit: cebb3e340a5c7ab74e7ea1a34a39c7dab0040022
    https://github.com/scummvm/scummvm/commit/cebb3e340a5c7ab74e7ea1a34a39c7dab0040022
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2014-06-03T22:42:56+02:00

Commit Message:
SCI32: fix crash during gabriel knight intro

Changed paths:
    engines/sci/graphics/paint32.cpp



diff --git a/engines/sci/graphics/paint32.cpp b/engines/sci/graphics/paint32.cpp
index f94c65c..7d106b5 100644
--- a/engines/sci/graphics/paint32.cpp
+++ b/engines/sci/graphics/paint32.cpp
@@ -43,8 +43,12 @@ GfxPaint32::~GfxPaint32() {
 
 void GfxPaint32::fillRect(Common::Rect rect, byte color) {
 	int16 y, x;
-	for (y = rect.top; y < rect.bottom; y++) {
-		for (x = rect.left; x < rect.right; x++) {
+	Common::Rect clipRect = rect;
+
+	clipRect.clip(_screen->getWidth(), _screen->getHeight());
+	
+	for (y = clipRect.top; y < clipRect.bottom; y++) {
+		for (x = clipRect.left; x < clipRect.right; x++) {
 			_screen->putPixel(x, y, GFX_SCREEN_MASK_VISUAL, color, 0, 0);
 		}
 	}