[Scummvm-git-logs] scummvm master -> 12b1cb62cc15590efb6b033ca59d997ab2d35097

[dwatteau]

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:
12b1cb62cc SCUMM: Avoid UBSan warning in drawBomp()


Commit: 12b1cb62cc15590efb6b033ca59d997ab2d35097
    https://github.com/scummvm/scummvm/commit/12b1cb62cc15590efb6b033ca59d997ab2d35097
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-01T18:03:12+01:00

Commit Message:
SCUMM: Avoid UBSan warning in drawBomp()

Only change `mask` if `bd.maskPtr` is non-null, as done everywhere else
in that function.

Changed paths:
    engines/scumm/bomp.cpp


diff --git a/engines/scumm/bomp.cpp b/engines/scumm/bomp.cpp
index bf6018d25a3..e741559dfe8 100644
--- a/engines/scumm/bomp.cpp
+++ b/engines/scumm/bomp.cpp
@@ -325,7 +325,8 @@ void drawBomp(const BompDrawData &bd) {
 
 		// Advance to the next line
 		pos_y++;
-		mask += bd.numStrips;
+		if (bd.maskPtr)
+			mask += bd.numStrips;
 		dst += bd.dst.pitch;
 	}
 }