From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 21 Jan 2021 22:31:19 +0000 (+0100)
Subject: doh: make Curl_doh_is_resolved survive a NULL pointer
X-Git-Tag: curl-7_75_0~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b97a60f5f4d3fb63002bc76fcbc6cdeb4572189e;p=thirdparty%2Fcurl.git

doh: make Curl_doh_is_resolved survive a NULL pointer

... if Curl_doh() returned a NULL, this function gets called anyway as
in a asynch procedure. Then the doh struct pointer is NULL and signifies
an OOM situation.

Follow-up to 6246a1d8c6776
---

diff --git a/lib/doh.c b/lib/doh.c
index f9feabacc0..608f3d94c4 100644
--- a/lib/doh.c
+++ b/lib/doh.c
@@ -918,6 +918,8 @@ CURLcode Curl_doh_is_resolved(struct connectdata *conn,
   struct Curl_easy *data = conn->data;
   struct dohdata *dohp = data->req.doh;
   *dnsp = NULL; /* defaults to no response */
+  if(!dohp)
+    return CURLE_OUT_OF_MEMORY;
 
   if(!dohp->probe[DOH_PROBE_SLOT_IPADDR_V4].easy &&
      !dohp->probe[DOH_PROBE_SLOT_IPADDR_V6].easy) {