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

eriktorbjorn noreply at scummvm.org
Sat May 3 08:31:52 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:
db72f45697 SCUMM: Changed OOB warnings to debug messages for well defined cases


Commit: db72f45697a2bd7a44c7dc04579f2173c3280022
    https://github.com/scummvm/scummvm/commit/db72f45697a2bd7a44c7dc04579f2173c3280022
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2025-05-03T10:30:41+02:00

Commit Message:
SCUMM: Changed OOB warnings to debug messages for well defined cases

They're probably indicative of script bugs, but they will still work as
was probably intended. If we start running into the undefined cases, we
may want to look into extending the safety area a bit. At least for
string resources.

Changed paths:
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 21891d9d66c..77b9f1f38bf 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -2809,7 +2809,7 @@ void ScummEngine_v5::o5_startMusic() {
 			// can look at the global script #9 (0x888A in 49.LFL).
 			break;
 		}
-		debugC(DEBUG_GENERAL,"o5_startMusic(%d)", b);
+		debugC(DEBUG_GENERAL, "o5_startMusic(%d)", b);
 		setResult(result);
 	} else {
 		_sound->startSound(getVarOrDirectByte(PARAM_1));
@@ -3091,7 +3091,7 @@ void ScummEngine_v5::o5_stringOps() {
 			error("String %d does not exist", a);
 		if (b >= 0 && b < len + SAFETY_AREA) {
 			if (b >= len)
-			  warning("o5_stringOps: Allowing OOB write string%d[%d] = %d (size %d) (within safety area)", a, b, c, len);
+				debug(0, "o5_stringOps: Allowing OOB write string%d[%d] = %d (size %d) (within safety area)", a, b, c, len);
 			ptr[b] = c;
 		} else
 			warning("o5_stringOps: Denying OOB write string-%d[%d] = %d (size %d)", a, b, c, len);
@@ -3107,7 +3107,7 @@ void ScummEngine_v5::o5_stringOps() {
 			error("String %d does not exist", a);
 		if (b >= 0 && b < len + SAFETY_AREA) {
 			if (b >= len)
-				warning("o5_stringOps: Allowing OOB read string-%d[%d] (size %d) (within safety area)", a, b, len);
+				debug(0, "o5_stringOps: Allowing OOB read string-%d[%d] (size %d) (within safety area)", a, b, len);
 			setResult(ptr[b]);
 		} else {
 			warning("o5_stringOps: Denying OOB read string-%d[%d] (size %d)", a, b, len);




More information about the Scummvm-git-logs mailing list