Merge d7e072fe25 into 7c9506bc31

[Core] Fix CLAY__ELEMENT_DEFINITION_LATCH overflow in CLAY macro if 256 loops end at the same time
fix heap buffer overflow and support unicode characters
2025-04-22 06:08:03 +00:00 · 2025-03-27 21:54:55 +03:00 · 2025-03-27 10:14:17 +13:00 · 2025-03-06 14:20:46 +01:00
2 changed files with 13 additions and 7 deletions
--- a/clay.h
+++ b/clay.h
@ -136,7 +136,7 @@ static inline void Clay__SuppressUnusedLatchDefinitionVariableWarning(void) { (v
    for (                                                                                                                                                   \
        CLAY__ELEMENT_DEFINITION_LATCH = (Clay__OpenElement(), Clay__ConfigureOpenElement(CLAY__CONFIG_WRAPPER(Clay_ElementDeclaration, __VA_ARGS__)), 0);  \
        CLAY__ELEMENT_DEFINITION_LATCH < 1;                                                                                                                 \
-        ++CLAY__ELEMENT_DEFINITION_LATCH, Clay__CloseElement()                                                                                              \
+        CLAY__ELEMENT_DEFINITION_LATCH=1, Clay__CloseElement()                                                                                              \
    )

 // These macros exist to allow the CLAY() macro to be called both with an inline struct definition, such as
--- a/renderers/raylib/clay_renderer_raylib.c
+++ b/renderers/raylib/clay_renderer_raylib.c
@ -99,16 +99,22 @@ static inline Clay_Dimensions Raylib_MeasureText(Clay_StringSlice text, Clay_Tex

    float scaleFactor = config->fontSize/(float)fontToUse.baseSize;

-    for (int i = 0; i < text.length; ++i)
-    {
-        if (text.chars[i] == '\n') {
+    int byte_index = 0;
+    while (byte_index < text.length) {
+        if (text.chars[byte_index] == '\n') {
            maxTextWidth = fmax(maxTextWidth, lineTextWidth);
            lineTextWidth = 0;
+            byte_index++;
            continue;
        }
-        int index = text.chars[i] - 32;
-        if (fontToUse.glyphs[index].advanceX != 0) lineTextWidth += fontToUse.glyphs[index].advanceX;
-        else lineTextWidth += (fontToUse.recs[index].width + fontToUse.glyphs[index].offsetX);
+
+        int codepoint_bytes = 0;
+        int codepoint = GetCodepoint(&text.chars[byte_index], &codepoint_bytes);
+        int glyph_index = GetGlyphIndex(fontToUse, codepoint);
+        byte_index += codepoint_bytes;
+
+        if (fontToUse.glyphs[glyph_index].advanceX != 0) lineTextWidth += fontToUse.glyphs[glyph_index].advanceX;
+        else lineTextWidth += (fontToUse.recs[glyph_index].width + fontToUse.glyphs[glyph_index].offsetX);
    }

    maxTextWidth = fmax(maxTextWidth, lineTextWidth);
Author	SHA1	Message	Date
Yaroslav Erohin	a17b80a24c	Merge `d7e072fe25` into `7c9506bc31`	2025-03-27 21:54:55 +03:00
Piggybank Studios	7c9506bc31	[Core] Fix CLAY__ELEMENT_DEFINITION_LATCH overflow in CLAY macro if 256 loops end at the same time Some checks are pending CMake on multiple platforms / build (Release, cl, cl, windows-latest) (push) Waiting to run Details CMake on multiple platforms / build (Release, clang, clang++, ubuntu-latest) (push) Waiting to run Details CMake on multiple platforms / build (Release, gcc, g++, ubuntu-latest) (push) Waiting to run Details	2025-03-27 10:14:17 +13:00
Iaroslav Erokhin	d7e072fe25	fix heap buffer overflow and support unicode characters	2025-03-06 14:20:46 +01:00