From 3834a04d82fce7e935dbc3b2f1ad293550cda49c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 23 Mar 2023 06:21:14 +0100 Subject: Merging upstream version 2.11.2. Signed-off-by: Daniel Baumann --- src/opt.c | 4 ++-- src/test/test1.sh | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/opt.c b/src/opt.c index bd0bc52..cd312ad 100644 --- a/src/opt.c +++ b/src/opt.c @@ -239,9 +239,9 @@ static int perf_opt_long_parse(char* optarg) char* arg; if ((arg = strchr(optarg, '='))) { + optlen = arg - optarg; arg++; - optlen = strlen(arg); - if (optlen < 1) { + if (optlen < 1 || !strlen(arg)) { return -1; } } else { diff --git a/src/test/test1.sh b/src/test/test1.sh index a289c99..a2944d4 100755 --- a/src/test/test1.sh +++ b/src/test/test1.sh @@ -10,3 +10,5 @@ # test for broken long opt in v2.11.0 ../dnsperf -O suppress=test 2>&1 |grep -q "unknown message type to suppress: test" +# ...and in v2.11.1, issue #234 +../dnsperf -O doh-uri=https://blahblah.com/dns-query -O suppress=timeouts -h \ No newline at end of file -- cgit v1.2.3