From patchwork Tue Apr 10 14:17:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: lib: fwts_args: only handle non-zero length short_names Date: Tue, 10 Apr 2012 04:17:58 -0000 From: Colin King X-Patchwork-Id: 151580 Message-Id: <1334067478-812-1-git-send-email-colin.king@canonical.com> To: fwts-devel@lists.ubuntu.com From: Colin Ian King Signed-off-by: Colin Ian King Acked-by: Alex Hung Acked-by: Keng-Yu Lin --- src/lib/src/fwts_args.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/src/fwts_args.c b/src/lib/src/fwts_args.c index 90f3d70..b5ef3e0 100644 --- a/src/lib/src/fwts_args.c +++ b/src/lib/src/fwts_args.c @@ -116,14 +116,14 @@ int fwts_args_parse(fwts_framework *fw, int argc, char * const argv[]) for (i=0; inum_options; i++, n++) { char *short_name = options_table->options[i].short_name; + size_t len; long_options[n].name = options_table->options[i].long_name; long_options[n].has_arg = options_table->options[i].has_arg; long_options[n].flag = 0; long_options[n].val = 0; - if (short_name != NULL) { - int len = strlen(short_name); + if (short_name && (len = strlen(short_name)) > 0) { if (short_options) { short_options = realloc(short_options, strlen(short_options) + len + 1);