[Scummvm-git-logs] scummvm master -> 0338871178d077fee2c0f9ae7c490bf4f06969d8

[sev-]

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:
0c60769254 QDENGINE: Fix potential buffer overrun. CID 1611400
0338871178 AWE: Fix regression introduced in bbf1e738926edbc41429aba630a56cfa310c03bd


Commit: 0c607692547f127584dbcfa2a3a720ca3c71d607
    https://github.com/scummvm/scummvm/commit/0c607692547f127584dbcfa2a3a720ca3c71d607
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-06-12T19:47:33+02:00

Commit Message:
QDENGINE: Fix potential buffer overrun. CID 1611400

Changed paths:
    engines/qdengine/qdengine.cpp


diff --git a/engines/qdengine/qdengine.cpp b/engines/qdengine/qdengine.cpp
index f0e6041585f..5ae99a39d99 100644
--- a/engines/qdengine/qdengine.cpp
+++ b/engines/qdengine/qdengine.cpp
@@ -588,7 +588,7 @@ byte *transCyrillic(const Common::String &str) {
 	int i = 0;
 
 	for (const byte *p = s; *p; p++) {
-		if (i >= 10240 - 3)
+		if (i >= 10240 - 5)
 			break;
 
 		if (*p < 128) {


Commit: 0338871178d077fee2c0f9ae7c490bf4f06969d8
    https://github.com/scummvm/scummvm/commit/0338871178d077fee2c0f9ae7c490bf4f06969d8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-06-12T20:06:53+02:00

Commit Message:
AWE: Fix regression introduced in bbf1e738926edbc41429aba630a56cfa310c03bd

Changed paths:
    engines/awe/resource_win31.cpp


diff --git a/engines/awe/resource_win31.cpp b/engines/awe/resource_win31.cpp
index a591f0df6b5..83b146869bc 100644
--- a/engines/awe/resource_win31.cpp
+++ b/engines/awe/resource_win31.cpp
@@ -149,8 +149,6 @@ struct LzHuffman {
 
 			if (i < kTableSize)
 				i = _child[i];
-
-			i = _child[i];
 		}
 		i -= kTableSize;
 		update(i);