Re: [PATCH] bootconfig: Fix missing return check of xbc_node_compose_key function

From: Masami Hiramatsu
Date: Tue Aug 31 2021 - 03:41:16 EST


On Tue, 31 Aug 2021 00:32:56 -0300
Julio Faracco <jcfaracco@xxxxxxxxx> wrote:

> The function `xbc_show_list should` handle the keys during the
> composition. Even the errors returned by the compose function. Instead
> of removing the `ret` variable, it should save the value and show the
> exact error. This missing variable is causing a compilation issue also.
>

Oops, good catch! Hmm, I missed some intermediate patch for some commit.
Let me check.

Thanks,

> Signed-off-by: Julio Faracco <jcfaracco@xxxxxxxxx>
> ---
> tools/bootconfig/main.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/tools/bootconfig/main.c b/tools/bootconfig/main.c
> index f45fa992e01d..fd67496a947f 100644
> --- a/tools/bootconfig/main.c
> +++ b/tools/bootconfig/main.c
> @@ -111,9 +111,11 @@ static void xbc_show_list(void)
> char key[XBC_KEYLEN_MAX];
> struct xbc_node *leaf;
> const char *val;
> + int ret;
>
> xbc_for_each_key_value(leaf, val) {
> - if (xbc_node_compose_key(leaf, key, XBC_KEYLEN_MAX) < 0) {
> + ret = xbc_node_compose_key(leaf, key, XBC_KEYLEN_MAX);
> + if (ret < 0) {
> fprintf(stderr, "Failed to compose key %d\n", ret);
> break;
> }
> --
> 2.31.1
>


--
Masami Hiramatsu <mhiramat@xxxxxxxxxx>