From 72c40dbd47b8684358432567cd20cbd3b9af92b8 Mon Sep 17 00:00:00 2001
From: uruk
Date: Tue, 18 Feb 2014 15:42:31 +0100
Subject: AVALANCHE: Repair writing off the boundaries in loadPictureGraphic().

---
 engines/avalanche/graphics.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'engines/avalanche/graphics.cpp')

diff --git a/engines/avalanche/graphics.cpp b/engines/avalanche/graphics.cpp
index 4bd6695bb8..367ca27c09 100644
--- a/engines/avalanche/graphics.cpp
+++ b/engines/avalanche/graphics.cpp
@@ -790,7 +790,10 @@ Graphics::Surface GraphicManager::loadPictureGraphic(Common::File &file) {
 				byte pixel = file.readByte();
 				for (int bit = 0; bit < 8; bit++) {
 					byte pixelBit = (pixel >> bit) & 1;
-					*(byte *)picture.getBasePtr(x + 7 - bit, y) += (pixelBit << plane);
+					// If the picture's width is not a multiple of 8, and we get over the boundary with the 'x' cycle, pixelBit is surely == 0.
+					// Otherwise, it doesn't cause trouble, since addign 0 doesn't have an effect at all.
+					if (pixelBit != 0)
+						*(byte *)picture.getBasePtr(x + 7 - bit, y) += (pixelBit << plane);
 				}
 			}
 		}
-- 
cgit v1.2.3