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

[eriktorbjorn]

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:
f80010e41f SCUMM: Reword string out of bounds warning messages a bit


Commit: f80010e41f3233bebb5a2baeb82c06da5a833a25
    https://github.com/scummvm/scummvm/commit/f80010e41f3233bebb5a2baeb82c06da5a833a25
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2025-05-02T19:51:16+02:00

Commit Message:
SCUMM: Reword string out of bounds warning messages a bit

Changed paths:
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 9854b240481..21891d9d66c 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -3091,10 +3091,10 @@ 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 writing %d to string %d (size %d) out of bounds (%d) since it's in the safety area", c, a, len, b);
+			  warning("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: Writing %d to string %d (size %d) out of bounds (%d)", c, a, len, b);
+			warning("o5_stringOps: Denying OOB write string-%d[%d] = %d (size %d)", a, b, c, len);
 		break;
 
 	case 4:											/* get string char */
@@ -3107,10 +3107,10 @@ 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 reading from strings %d (size %d) out of bounds (%d) since it's in the safety earea", a, len, b);
+				warning("o5_stringOps: Allowing OOB read string-%d[%d] (size %d) (within safety area)", a, b, len);
 			setResult(ptr[b]);
 		} else {
-			warning("o5_stringOps: Reading string %d (size %d) out of bounds (%d)", a, len, b);
+			warning("o5_stringOps: Denying OOB read string-%d[%d] (size %d)", a, b, len);
 			setResult(0);
 		}
 		break;