From: Andrew Goodbody <andrew.goodbody@linaro.org>
Date: Wed, 2 Jul 2025 09:24:16 +0000 (+0100)
Subject: boot: menu: Do not dereference pointer if pointer is NULL
X-Git-Tag: v2025.10-rc1~119
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=074e05952705972072f52128cf2e3ec2d8f35de6;p=thirdparty%2Fu-boot.git

boot: menu: Do not dereference pointer if pointer is NULL

scene_obj_find can return NULL but this is not checked for before
the return is dereferenced. Add a NULL check.

This issue was found by Smatch.

Also add a NULL check for str.

Signed-off-by: Andrew Goodbody <andrew.goodbody@linaro.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---

diff --git a/boot/scene_menu.c b/boot/scene_menu.c
index 8db6a2b2f4d..23404172093 100644
--- a/boot/scene_menu.c
+++ b/boot/scene_menu.c
@@ -571,14 +571,15 @@ int scene_menu_display(struct scene_obj_menu *menu)
 			return log_msg_ret("txt", -EINVAL);
 
 		str = expo_get_str(exp, txt->gen.str_id);
-		printf("%s\n\n", str);
+		printf("%s\n\n", str ? str : "");
 	}
 
 	if (list_empty(&menu->item_head))
 		return 0;
 
 	pointer = scene_obj_find(scn, menu->pointer_id, SCENEOBJT_TEXT);
-	pstr = expo_get_str(scn->expo, pointer->gen.str_id);
+	if (pointer)
+		pstr = expo_get_str(scn->expo, pointer->gen.str_id);
 
 	list_for_each_entry(item, &menu->item_head, sibling) {
 		struct scene_obj_txt *key = NULL, *label = NULL;