[Scummvm-git-logs] scummvm master -> 83957afe2799908027b4768e2a85ba19157b3d2f

[sdelamarre]

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

Summary:
667c7862db GOB: Fix a warning message in o1_createSprite
83957afe27 GOB: Ignore attempts to load a sprite beyond dest surface's height


Commit: 667c7862dbb93f62af8ffa341da98603bd87d863
    https://github.com/scummvm/scummvm/commit/667c7862dbb93f62af8ffa341da98603bd87d863
Author: Simon Delamarre (simon.delamarre14 at gmail.com)
Date: 2025-10-19T23:39:13+02:00

Commit Message:
GOB: Fix a warning message in o1_createSprite

Changed paths:
    engines/gob/inter_v1.cpp


diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp
index 0e6a54e71b7..683be2a8aad 100644
--- a/engines/gob/inter_v1.cpp
+++ b/engines/gob/inter_v1.cpp
@@ -1606,7 +1606,7 @@ void Inter_v1::o1_createSprite(OpFuncParams &params) {
 	flag = _vm->_game->_script->readInt16();
 	byte bpp = (flag & 0x200) ? 1 : _vm->_pixelFormat.bytesPerPixel;
 	if (width == 0 || height == 0) {
-		warning("Error in o1_createSprite: invalid sprite dimensions (w = %d, h = %d)", width, height);
+		warning("o1_createSprite(): invalid sprite dimensions (w = %d, h = %d)", width, height);
 		return;
 	}
 


Commit: 83957afe2799908027b4768e2a85ba19157b3d2f
    https://github.com/scummvm/scummvm/commit/83957afe2799908027b4768e2a85ba19157b3d2f
Author: Simon Delamarre (simon.delamarre14 at gmail.com)
Date: 2025-10-19T23:39:13+02:00

Commit Message:
GOB: Ignore attempts to load a sprite beyond dest surface's height

Also present in the original engine. Fix a crash due to a script bug
when leaving Adi4 applications.

Changed paths:
    engines/gob/video.cpp


diff --git a/engines/gob/video.cpp b/engines/gob/video.cpp
index 8ad1c8b3655..c711da51994 100644
--- a/engines/gob/video.cpp
+++ b/engines/gob/video.cpp
@@ -374,6 +374,11 @@ void Video::drawPacked(byte *sprBuf, int32 size, int16 width, int16 height,
 void Video::drawPackedSprite(byte *sprBuf, int32 size, int16 width, int16 height,
 		int16 x, int16 y, int16 transp, Surface &dest) {
 
+	if (y + height > dest.getHeight()) {
+		warning(" Video::drawPackedSprite: destY + height > destHeight");
+		return;
+	}
+
 	if (spriteUncompressor(sprBuf, size, width, height, x, y, transp, dest))
 		return;