From a596dcb9418fb17d2ad247630efb5d764a7b6abe Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Sun, 26 Jul 2015 14:54:24 -0400 Subject: [PATCH] Fix: Mishandled NULL short options in utils_generate_optstring() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The NULL character is used to indicate that no short option is available for a given command. Signed-off-by: Jérémie Galarneau --- src/common/utils.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/common/utils.c b/src/common/utils.c index 4b733fb5c..766f224c7 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -1050,9 +1050,11 @@ char *utils_generate_optstring(const struct option *long_options, break; } - optstring[str_pos++] = (char)long_options[i].val; - if (long_options[i].has_arg) { - optstring[str_pos++] = ':'; + if (long_options[i].val != '\0') { + optstring[str_pos++] = (char) long_options[i].val; + if (long_options[i].has_arg) { + optstring[str_pos++] = ':'; + } } } -- 2.34.1