Merge 38bb241ced into 06167b4f4b

[Core] Fix a potential null pointer deref in scroll GetScrollContainerData
2025-04-16 11:18:05 +00:00 · 2025-04-12 13:24:52 +01:00 · 2025-04-12 11:27:10 +12:00
1 changed files with 5 additions and 1 deletions
--- a/clay.h
+++ b/clay.h
@ -4118,11 +4118,15 @@ Clay_ScrollContainerData Clay_GetScrollContainerData(Clay_ElementId id) {
    for (int32_t i = 0; i < context->scrollContainerDatas.length; ++i) {
        Clay__ScrollContainerDataInternal *scrollContainerData = Clay__ScrollContainerDataInternalArray_Get(&context->scrollContainerDatas, i);
        if (scrollContainerData->elementId == id.id) {
+            Clay_ScrollElementConfig *scrollElementConfig = Clay__FindElementConfigWithType(scrollContainerData->layoutElement, CLAY__ELEMENT_CONFIG_TYPE_SCROLL).scrollElementConfig;
+            if (!scrollElementConfig) { // This can happen on the first frame before a scroll container is declared
+                return CLAY__INIT(Clay_ScrollContainerData) CLAY__DEFAULT_STRUCT;
+            }
            return CLAY__INIT(Clay_ScrollContainerData) {
                .scrollPosition = &scrollContainerData->scrollPosition,
                .scrollContainerDimensions = { scrollContainerData->boundingBox.width, scrollContainerData->boundingBox.height },
                .contentDimensions = scrollContainerData->contentSize,
-                .config = *Clay__FindElementConfigWithType(scrollContainerData->layoutElement, CLAY__ELEMENT_CONFIG_TYPE_SCROLL).scrollElementConfig,
+                .config = *scrollElementConfig,
                .found = true
            };
        }
Author	SHA1	Message	Date
Harrison Lambeth	b519eecbfb	Merge `38bb241ced` into `06167b4f4b`	2025-04-12 13:24:52 +01:00
Nic Barker	06167b4f4b	[Core] Fix a potential null pointer deref in scroll GetScrollContainerData Some checks failed CMake on multiple platforms / build (Release, cl, cl, windows-latest) (push) Has been cancelled Details CMake on multiple platforms / build (Release, clang, clang++, ubuntu-latest) (push) Has been cancelled Details CMake on multiple platforms / build (Release, gcc, g++, ubuntu-latest) (push) Has been cancelled Details	2025-04-12 11:27:10 +12:00