From 2e7ca3e8a6e1ae4dddd04d9d68197b2f8f87bf6d Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Wed, 29 Apr 2020 14:18:59 +0200 Subject: options: Properly handle unknown options with arguments Signed-off-by: Jakub Jelen Reviewed-by: Andreas Schneider --- src/options.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/options.c b/src/options.c index b5f951ac..f5c7bbb2 100644 --- a/src/options.c +++ b/src/options.c @@ -1217,6 +1217,11 @@ int ssh_options_getopt(ssh_session session, int *argcptr, char **argv) int saveopterr = opterr; int opt; + /* Nothing to do here */ + if (argc <= 1) { + return SSH_OK; + } + opterr = 0; /* shut up getopt */ while((opt = getopt(argc, argv, "c:i:Cl:p:vb:rd12")) != -1) { switch(opt) { @@ -1266,8 +1271,19 @@ int ssh_options_getopt(ssh_session session, int *argcptr, char **argv) return -1; } current++; - if (optarg) { - save[current++] = argv[optind + 1]; + /* We can not use optarg here as getopt does not set it for + * unknown options. We need to manually extract following + * option and skip it manually from further processing */ + if (optind < argc && argv[optind][0] != '-') { + tmp = realloc(save, (current + 1) * sizeof(char*)); + if (tmp == NULL) { + SAFE_FREE(save); + ssh_set_error_oom(session); + return -1; + } + save = tmp; + save[current++] = argv[optind]; + optind++; } } } /* switch */ -- cgit v1.2.3