summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2023-03-23 05:21:14 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2023-03-23 05:21:14 +0000
commit3834a04d82fce7e935dbc3b2f1ad293550cda49c (patch)
tree96b5d7fb34e1c828aa7ac1cca4baa72d8d1fe976 /src
parentReleasing debian version 2.11.1-1. (diff)
downloaddnsperf-3834a04d82fce7e935dbc3b2f1ad293550cda49c.tar.xz
dnsperf-3834a04d82fce7e935dbc3b2f1ad293550cda49c.zip
Merging upstream version 2.11.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src')
-rw-r--r--src/opt.c4
-rwxr-xr-xsrc/test/test1.sh2
2 files changed, 4 insertions, 2 deletions
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