From 2e650c1f5f2f79e7db10dec5dcdd1cffcaf47891 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 26 Jul 2022 07:11:40 +0200 Subject: Merging upstream version 2.1~rc0 (Closes: #1015722). Signed-off-by: Daniel Baumann --- util/argconfig.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'util/argconfig.c') diff --git a/util/argconfig.c b/util/argconfig.c index 59d8f1d..d09ba9d 100644 --- a/util/argconfig.c +++ b/util/argconfig.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 PMC-Sierra, Inc. * @@ -135,7 +136,7 @@ void argconfig_print_help(const char *program_desc, return; printf("\n\033[1mOptions:\033[0m\n"); - for (s = options; (s->option != NULL) && (s != NULL); s++) + for (s = options; (s != NULL) && (s->option != NULL); s++) show_option(s); } @@ -528,7 +529,8 @@ void argconfig_register_help_func(argconfig_help_func * f) for (i = 0; i < MAX_HELP_FUNC; i++) { if (help_funcs[i] == NULL) { help_funcs[i] = f; - help_funcs[i + 1] = NULL; + if (i < MAX_HELP_FUNC - 1) + help_funcs[i + 1] = NULL; break; } } -- cgit v1.2.3