Merge 4c02bd08a7 into 9e7595b873

Fixed a bug where minMemorySize could cause a memory overwrite
Fix uint64 usage for wasm
2025-05-07 02:48:04 +00:00 · 2025-01-11 09:54:16 -03:00 · 2025-01-11 21:37:21 +13:00 · 2025-01-11 21:35:45 +13:00
3 changed files with 2 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +1,5 @@
 cmake-build-debug/
 cmake-build-release/
 build/
 .DS_Store
 .idea/
 node_modules/
--- a/clay.h
+++ b/clay.h
@ -1390,7 +1390,7 @@ struct Clay_Context {
    bool externalScrollHandlingEnabled;
    uint32_t debugSelectedElementId;
    uint32_t generation;
-    uint64_t arenaResetOffset;
+    uintptr_t arenaResetOffset;
    Clay_Arena internalArena;
    // Layout Elements / Render Commands
    Clay_LayoutElementArray layoutElements;
@ -3615,7 +3615,7 @@ uint32_t Clay_MinMemorySize(void) {
        .maxMeasureTextCacheWordCount = Clay__defaultMaxMeasureTextWordCacheCount,
        .internalArena = {
            .capacity = SIZE_MAX,
-            .memory = (char*)&fakeContext,
+            .memory = NULL,
        }
    };
    Clay_Context* currentContext = Clay_GetCurrentContext();
--- a/examples/clay-official-website/build/clay/index.wasm
+++ b/examples/clay-official-website/build/clay/index.wasm
Author	SHA1	Message	Date
Valentin Berman	05cd3b7a46	Merge `4c02bd08a7` into `9e7595b873`	2025-01-11 09:54:16 -03:00
Nic Barker	9e7595b873	Fixed a bug where minMemorySize could cause a memory overwrite Some checks failed 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) Failing after 12s Details CMake on multiple platforms / build (Release, gcc, g++, ubuntu-latest) (push) Failing after 11s Details	2025-01-11 21:37:21 +13:00
Nic Barker	32d1a31dfe	Fix uint64 usage for wasm	2025-01-11 21:35:45 +13:00