From 408011c2a4b7a7f68cf55876252446a570b3827a Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 1 Oct 2023 19:13:26 -0600 Subject: [PATCH] expo: Correct the logic for duplicate-ID detection Update scene_txt_str() to account for the possibility that the passed-in str_id may be 0 Signed-off-by: Simon Glass --- boot/scene.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boot/scene.c b/boot/scene.c index 9c4466c1a4..8e5d3aa7dc 100644 --- a/boot/scene.c +++ b/boot/scene.c @@ -176,8 +176,9 @@ int scene_txt_str(struct scene *scn, const char *name, uint id, uint str_id, ret = expo_str(scn->expo, name, str_id, str); if (ret < 0) return log_msg_ret("str", ret); - else if (ret != str_id) + if (str_id && ret != str_id) return log_msg_ret("id", -EEXIST); + str_id = ret; ret = scene_obj_add(scn, name, id, SCENEOBJT_TEXT, sizeof(struct scene_obj_txt), -- 2.39.5