From c6d5ca1771dba3c78c243c4a9e1c0613f17c2497 Mon Sep 17 00:00:00 2001 From: Milos Tijanic Date: Mon, 30 Oct 2023 19:34:58 +0100 Subject: [PATCH] Fix null deref in nk_group_scrolled_offset_begin --- clib.json | 2 +- nuklear.h | 10 +++++++++- src/CHANGELOG | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/clib.json b/clib.json index cf690c789..e83c57bd8 100644 --- a/clib.json +++ b/clib.json @@ -1,6 +1,6 @@ { "name": "nuklear", - "version": "4.10.6", + "version": "4.10.7", "repo": "Immediate-Mode-UI/Nuklear", "description": "A small ANSI C gui toolkit", "keywords": ["gl", "ui", "toolkit"], diff --git a/nuklear.h b/nuklear.h index c2edb75a0..face1d105 100644 --- a/nuklear.h +++ b/nuklear.h @@ -22827,7 +22827,15 @@ nk_group_begin_titled(struct nk_context *ctx, const char *id, NK_ASSERT(y_offset); if (!x_offset || !y_offset) return 0; *x_offset = *y_offset = 0; - } else y_offset = nk_find_value(win, id_hash+1); + } else { + y_offset = nk_find_value(win, id_hash+1); + if (!y_offset) { + y_offset = nk_add_value(ctx, win, id_hash+1, 0); + NK_ASSERT(y_offset); + if (!y_offset) return 0; + *y_offset = 0; + } + } return nk_group_scrolled_offset_begin(ctx, x_offset, y_offset, title, flags); } NK_API nk_bool diff --git a/src/CHANGELOG b/src/CHANGELOG index 9c8c65748..d1fabcc34 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -7,6 +7,7 @@ /// - [y]: Minor version with non-breaking API and library changes /// - [z]: Patch version with no direct changes to the API /// +/// - 2023/10/30 (4.10.7) - Fix null pointer dereference in nk_group_scrolled_offset_begin() /// - 2022/12/23 (4.10.6) - Fix incorrect glyph index in nk_font_bake() /// - 2022/12/17 (4.10.5) - Fix nk_font_bake_pack() using TTC font offset incorrectly /// - 2022/10/24 (4.10.4) - Fix nk_str_{append,insert}_str_utf8 always returning 0