[Scummvm-git-logs] scummvm master -> 9f1f5057c99e3f5e2b196d7da9995d8fd8fcaae1

[bonki]

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:
9f1f5057c9 TUCKER: Fix theoretical out-of-bounds read


Commit: 9f1f5057c99e3f5e2b196d7da9995d8fd8fcaae1
    https://github.com/scummvm/scummvm/commit/9f1f5057c99e3f5e2b196d7da9995d8fd8fcaae1
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-02-25T16:21:37+01:00

Commit Message:
TUCKER: Fix theoretical out-of-bounds read

Changed paths:
    engines/tucker/graphics.cpp


diff --git a/engines/tucker/graphics.cpp b/engines/tucker/graphics.cpp
index 7b17bd0..3a6bd22 100644
--- a/engines/tucker/graphics.cpp
+++ b/engines/tucker/graphics.cpp
@@ -122,7 +122,7 @@ void Graphics::decodeRLE_248(uint8 *dst, const uint8 *src, int w, int h, int y1,
 				}
 			}
 			if (color != 0) {
-				if (( (whitelistReservedColors != nullptr && (*(whitelistReservedColors + dst[offset] - 0xE0) == 1) && dst[offset] <= 0xEF) || dst[offset] < 0xE0 || y + y1 < y2) && dst[offset] < 0xF8) {
+				if (( (whitelistReservedColors != nullptr && (dst[offset] & 0xE0) == 0xE0 && *(whitelistReservedColors + dst[offset] - 0xE0) == 1) || dst[offset] < 0xE0 || y + y1 < y2) && dst[offset] < 0xF8) {
 					dst[offset] = color;
 				}
 			} else {