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

SCI: Fix out of bounds read when measuring text

Browse Source 
Found with valgrind. The OOB read did not affect behavior.
Introduced in 8a87d1030c706db7fede0b5ece0aeabdf1a671cb
This commit is contained in:
sluicebox 2022-05-18 00:13:45 -04:00
parent da83cb79a9
commit 34983d1017
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
engines/sci/graphics/text16.cpp
View File

@ -211,11 +211,10 @@ int16 GfxText16::GetLongest(const char *&textPtr, int16 maxWidth, GuiResourceId
curChar = (*(const byte *)textPtr);
if (_font->isDoubleByte(curChar)) {
curChar |= (*(const byte *)(textPtr + 1)) << 8;
}
if (escapedNewLine) {
} else if (escapedNewLine) {
escapedNewLine = false;
curChar = 0x0D;
} else if (isJapaneseNewLine(curChar, *(textPtr + 1))) {
} else if (curChar && isJapaneseNewLine(curChar, *(textPtr + 1))) {
escapedNewLine = true;
curChar = ' ';
}
@ -391,11 +390,10 @@ void GfxText16::Width(const char *text, int16 from, int16 len, GuiResourceId org
if (_font->isDoubleByte(curChar)) {
curChar |= (*(const byte *)text++) << 8;
len--;
}
if (escapedNewLine) {
} else if (escapedNewLine) {
escapedNewLine = false;
curChar = 0x0D;
} else if (isJapaneseNewLine(curChar, *text)) {
} else if (curChar && isJapaneseNewLine(curChar, *text)) {
escapedNewLine = true;
curChar = ' ';
}
@ -513,11 +511,10 @@ void GfxText16::Draw(const char *text, int16 from, int16 len, GuiResourceId orgF
if (_font->isDoubleByte(curChar)) {
curChar |= (*(const byte *)text++) << 8;
len--;
}
if (escapedNewLine) {
} else if (escapedNewLine) {
escapedNewLine = false;
curChar = 0x0D;
} else if (isJapaneseNewLine(curChar, *text)) {
} else if (curChar && isJapaneseNewLine(curChar, *text)) {
escapedNewLine = true;
curChar = ' ';
}