From 87a6b28c0f3b6c5b38e0f8a8533df39d3f0c0f03 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Fri, 21 Aug 2020 10:56:04 +0900 Subject: argparse: Handle a corner case of wrong ARGC. * src/argparse.c (arg_parse): Avoid null dereference when ARGC is wrong. Signed-off-by: NIIBE Yutaka --- src/argparse.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/argparse.c b/src/argparse.c index ca2b951..69bafca 100644 --- a/src/argparse.c +++ b/src/argparse.c @@ -1925,14 +1925,13 @@ arg_parse (gpgrt_argparse_t *arg, gpgrt_opt_t *opts_orig, int no_init) } next_one: - if (!argc) + if (!argc || (s = *argv) == NULL) { /* No more args. */ arg->r_opt = 0; goto leave; /* Ready. */ } - s = *argv; arg->internal->last = s; arg->internal->opt_flags = 0; -- cgit v1.2.3