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

Marisa-Chan noreply at scummvm.org
Wed Mar 11 04:53:12 UTC 2026


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:
be9955582e GAMOS: Fix possible Out-of-bounds CID 1645158, 1645147


Commit: be9955582edb0845ee731acd5dc8657dc3ef7e37
    https://github.com/scummvm/scummvm/commit/be9955582edb0845ee731acd5dc8657dc3ef7e37
Author: Marisa-Chan (thunder_8888 at mail.ru)
Date: 2026-03-11T11:52:54+07:00

Commit Message:
GAMOS: Fix possible Out-of-bounds CID 1645158, 1645147
       Fix obvious Out-of-bounds CID 1645145

Changed paths:
    engines/gamos/file.cpp
    engines/gamos/gamos.cpp


diff --git a/engines/gamos/file.cpp b/engines/gamos/file.cpp
index 1143460e96d..c91b49c3a07 100644
--- a/engines/gamos/file.cpp
+++ b/engines/gamos/file.cpp
@@ -113,8 +113,8 @@ int32 GameFile::readPackedInt() {
 		warning("readPackedInt skipped %d", skipsz);
 	}
 
-	static int32 negs[4] {0, -1, -1025, -263169};
-	static int32 adds[4] {0, 0x80, 0x480, 0x40480};
+	static int32 negs[5] {0, -1, -1025, -263169, 0x47f};
+	static int32 adds[5] {0, 0x80, 0x480, 0x40480, 0};
 
 	if (b & 0x20) {
 		val += (b & 3) * (1 << ((num << 3) & 0x1f));
diff --git a/engines/gamos/gamos.cpp b/engines/gamos/gamos.cpp
index 02685e3f433..1ca13bde139 100644
--- a/engines/gamos/gamos.cpp
+++ b/engines/gamos/gamos.cpp
@@ -1216,7 +1216,6 @@ void GamosEngine::readData2(const RawData &data) {
 		_messageProc._keyCodes[9] = KeyCodes::WIN_RETURN;
 		_messageProc._keyCodes[10] = KeyCodes::WIN_TAB;
 		_messageProc._keyCodes[11] = KeyCodes::WIN_INVALID;
-		_messageProc._keyCodes[12] = KeyCodes::WIN_INVALID;
 	}
 }
 




More information about the Scummvm-git-logs mailing list