Fix: Mishandled NULL short options in utils_generate_optstring()

The NULL character is used to indicate that no short option is
available for a given command.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/common/utils.c b/src/common/utils.c
index 4b733fb5cc346ead97b928809c9056eb42290904..766f224c7e167118d30dbd99c6b32595b4fe99e4 100644 (file)
--- 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++] = ':';
+                       }
                }
        }