MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix OOB error in DrawString

Browse source
This commit is contained in:
staphen 2021-09-13 17:08:38 -04:00 • committed by Anders Jenbo
commit 09b8afba4e
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Source/engine/render/text_render.cpp
View file

@ -201,8 +201,13 @@ uint32_t DrawString(const Surface &out, string_view text, const Rectangle &rect,
break;
characterPosition.y += lineHeight;
if (HasAnyOf(flags, (UiFlags::AlignCenter | UiFlags::AlignRight | UiFlags::KerningFitSpacing)))
lineWidth = GetLineWidth(&text[i + 1], size, spacing, &charactersInLine);
if (HasAnyOf(flags, (UiFlags::AlignCenter | UiFlags::AlignRight | UiFlags::KerningFitSpacing))) {
int nextLineIndex = text[i] == '\n' ? i + 1 : i;
if (nextLineIndex < text.length())
lineWidth = GetLineWidth(&text[nextLineIndex], size, spacing, &charactersInLine);
else
lineWidth = 0;
}
if (HasAnyOf(flags, UiFlags::KerningFitSpacing))
spacing = AdjustSpacingToFitHorizontally(lineWidth, maxSpacing, charactersInLine, rect.size.width);