From c8d1f3e750d5fe96a1745b718382429e49efd176 Mon Sep 17 00:00:00 2001 From: JoeStrout Date: Fri, 6 Mar 2026 08:52:58 -0700 Subject: [PATCH] Make LoadFontFromImage limit its scanning to image dimensions. (#5626) --- src/rtext.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/rtext.c b/src/rtext.c index ff59d667e..c563b1185 100644 --- a/src/rtext.c +++ b/src/rtext.c @@ -446,7 +446,8 @@ Font LoadFontFromImage(Image image, Color key, int firstChar) int charHeight = 0; int j = 0; - while (!COLOR_EQUAL(pixels[(lineSpacing + j)*image.width + charSpacing], key)) j++; + while ((lineSpacing + j) < image.height && + !COLOR_EQUAL(pixels[(lineSpacing + j)*image.width + charSpacing], key)) j++; charHeight = j; @@ -469,7 +470,8 @@ Font LoadFontFromImage(Image image, Color key, int firstChar) int charWidth = 0; - while (!COLOR_EQUAL(pixels[(lineSpacing + (charHeight+lineSpacing)*lineToRead)*image.width + xPosToRead + charWidth], key)) charWidth++; + while ((xPosToRead + charWidth) < image.width && + !COLOR_EQUAL(pixels[(lineSpacing + (charHeight+lineSpacing)*lineToRead)*image.width + xPosToRead + charWidth], key)) charWidth++; tempCharRecs[index].width = (float)charWidth;