griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #116135: Ensure blf_font_width_to_rstrlen always works

Browse Source 
If the string is shorter than the cut-off length, ensure we always
exit cleanly when we iterate to the very start of the string.

Pull Request: https://projects.blender.org/blender/blender/pulls/116208
This commit is contained in:
Harley Acheson
2023-12-14 23:19:08 +01:00
committed by Harley Acheson
parent 87e8a282bc
commit 8c6898c04d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenfont/intern/blf_font.cc
View File

@@ -769,7 +769,7 @@ size_t blf_font_width_to_rstrlen(
i_tmp = i;
g = blf_glyph_from_utf8_and_step(font, gc, nullptr, str, str_len, &i_tmp, nullptr);
for (width_new = pen_x = 0; (s != nullptr);
for (width_new = pen_x = 0; (s != nullptr && i > 0);
i = i_prev, s = s_prev, g = g_prev, g_prev = nullptr, width_new = pen_x)
{
s_prev = BLI_str_find_prev_char_utf8(s, str);