From 3208f063b50f50ba643b94846d096f1d2b298d23 Mon Sep 17 00:00:00 2001
From: Colin Snover
Date: Sat, 24 Sep 2016 14:24:35 -0500
Subject: SCI32: Extra bounds checking in CelObj renderer

---
 engines/sci/graphics/celobj32.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'engines/sci/graphics')

diff --git a/engines/sci/graphics/celobj32.cpp b/engines/sci/graphics/celobj32.cpp
index 03e2114695..5d2d5dd6a6 100644
--- a/engines/sci/graphics/celobj32.cpp
+++ b/engines/sci/graphics/celobj32.cpp
@@ -154,6 +154,7 @@ struct SCALER_NoScale {
 template<bool FLIP, typename READER>
 struct SCALER_Scale {
 #ifndef NDEBUG
+	int16 _minX;
 	int16 _maxX;
 #endif
 	const byte *_row;
@@ -165,6 +166,7 @@ struct SCALER_Scale {
 	SCALER_Scale(const CelObj &celObj, const Common::Rect &targetRect, const Common::Point &scaledPosition, const Ratio scaleX, const Ratio scaleY) :
 	_row(nullptr),
 #ifndef NDEBUG
+	_minX(targetRect.left),
 	_maxX(targetRect.right - 1),
 #endif
 	// The maximum width of the scaled object may not be as
@@ -234,11 +236,11 @@ struct SCALER_Scale {
 	inline void setTarget(const int16 x, const int16 y) {
 		_row = _reader.getRow(_valuesY[y]);
 		_x = x;
-		assert(_x >= 0 && _x <= _maxX);
+		assert(_x >= _minX && _x <= _maxX);
 	}
 
 	inline byte read() {
-		assert(_x >= 0 && _x <= _maxX);
+		assert(_x >= _minX && _x <= _maxX);
 		return _row[_valuesX[_x++]];
 	}
 };
-- 
cgit v1.2.3