[Scummvm-git-logs] scummvm master -> a86ac8345483d722a6612216c8f40a0af136c9f3

orgads noreply at scummvm.org
Wed May 14 15:25:14 UTC 2025


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

Summary:
a86ac83454 GOB: Initialize local variables


Commit: a86ac8345483d722a6612216c8f40a0af136c9f3
    https://github.com/scummvm/scummvm/commit/a86ac8345483d722a6612216c8f40a0af136c9f3
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2025-05-14T18:24:43+03:00

Commit Message:
GOB: Initialize local variables

The get functions have conditions which can leave these vars uninitialized.

Changed paths:
    engines/gob/aniobject.cpp
    engines/gob/dataio.cpp


diff --git a/engines/gob/aniobject.cpp b/engines/gob/aniobject.cpp
index e5a7f062bc1..8fa1863d6c6 100644
--- a/engines/gob/aniobject.cpp
+++ b/engines/gob/aniobject.cpp
@@ -167,7 +167,7 @@ bool ANIObject::isIn(int16 x, int16 y) const {
 	if (!isVisible())
 		return false;
 
-	int16 frameX, frameY, frameWidth, frameHeight;
+	int16 frameX = 0, frameY = 0, frameWidth = 0, frameHeight = 0;
 	getFramePosition(frameX, frameY);
 	getFrameSize(frameWidth, frameHeight);
 
@@ -183,7 +183,7 @@ bool ANIObject::isIn(const ANIObject &obj) const {
 	if (!isVisible() || !obj.isVisible())
 		return false;
 
-	int16 frameX, frameY, frameWidth, frameHeight;
+	int16 frameX = 0, frameY = 0, frameWidth = 0, frameHeight = 0;
 	getFramePosition(frameX, frameY);
 	getFrameSize(frameWidth, frameHeight);
 
diff --git a/engines/gob/dataio.cpp b/engines/gob/dataio.cpp
index deb9cc370fd..3d58597fc61 100644
--- a/engines/gob/dataio.cpp
+++ b/engines/gob/dataio.cpp
@@ -103,6 +103,8 @@ byte *DataIO::unpack(Common::SeekableReadStream &src, int32 &size, uint8 compres
 		size = src.readUint32LE();
 	else if (compression == 2)
 		size = getSizeChunks(src);
+	else
+		size = 0;
 
 	assert(size > 0);
 




More information about the Scummvm-git-logs mailing list