From f7e14fee6891506154fd541e9e47f3071407adb5 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 26 Jul 2022 11:00:31 +0200 Subject: [PATCH] tool_getparam: make --doh-url "" switch it off A possible future addition could be to parse the URL first too to verify that it is valid before trying to use it. Assisted-by: Jay Satiro Closes #9207 --- docs/cmdline-opts/doh-url.d | 3 +++ src/tool_getparam.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/docs/cmdline-opts/doh-url.d b/docs/cmdline-opts/doh-url.d index 94e1a0b956..746623ff45 100644 --- a/docs/cmdline-opts/doh-url.d +++ b/docs/cmdline-opts/doh-url.d @@ -16,4 +16,7 @@ name lookups take place over SSL. However, the certificate verification settings are not inherited and can be controlled separately via --doh-insecure and --doh-cert-status. +This option is unset if an empty string "" is used as the URL. (Added in +7.85.0) + If this option is used several times, the last one will be used. diff --git a/src/tool_getparam.c b/src/tool_getparam.c index 9bbd51d34e..f2ad91c193 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -701,6 +701,9 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ break; case 'C': /* doh-url */ GetStr(&config->doh_url, nextarg); + if(config->doh_url && !config->doh_url[0]) + /* if given a blank string, we make it NULL again */ + Curl_safefree(config->doh_url); break; case 'd': /* ciphers */ GetStr(&config->cipher_list, nextarg); -- 2.47.3