libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-25 05:34:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCUMM: (DIG) - fix workaround for Russian version so as not to write outside the expected scope

Browse Source 
I experienced weird string modifications while trying to improve the text code. Turns out that this workaround will kick in even for 0 length strings and will lead to values being written to "negative" (before the original dst ptr argument) offsets.
This commit is contained in:
athrxx 2021-09-10 18:17:04 +02:00
parent bc8eab27fc
commit 48fb15812d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engines/scumm/string.cpp
View File

@ -1239,10 +1239,11 @@ int ScummEngine::convertMessageToString(const byte *msg, byte *dst, int dstSize)
byte chr;
byte lastChr = 0;
const byte *src;
byte *end;
byte *start, *end;
byte transBuf[2048];
assert(dst);
start = dst;
end = dst + dstSize;
if (msg == NULL) {
@ -1360,7 +1361,7 @@ int ScummEngine::convertMessageToString(const byte *msg, byte *dst, int dstSize)
// it does not work as is with our rendering code, thus fixing it
// with a workaround.
if (_game.id == GID_DIG) {
while (*(dst - 1) == 0x03)
while (dst > start && *(dst - 1) == 0x03)
dst--;
}
*dst = 0;