1 files changed, 12 insertions, 15 deletions

diff --git a/libs/libcurl/src/doh.c b/libs/libcurl/src/doh.c
index 0abeb965cd..6bc2c43b10 100644
--- a/libs/libcurl/src/doh.c
+++ b/libs/libcurl/src/doh.c
@@ -218,7 +218,6 @@ static CURLcode dohprobe(struct Curl_easy *data,
                          struct curl_slist *headers)

 {

   struct Curl_easy *doh = NULL;

-  char *nurl = NULL;

   CURLcode result = CURLE_OK;

   timediff_t timeout_ms;

   DOHcode d = doh_encode(host, dnstype, p->dohbuffer, sizeof(p->dohbuffer),

@@ -351,11 +350,9 @@ static CURLcode dohprobe(struct Curl_easy *data,
   }

   else

     goto error;

-  free(nurl);

   return CURLE_OK;

 

 error:

-  free(nurl);

   Curl_close(&doh);

   return result;

 }

@@ -447,7 +444,7 @@ static DOHcode skipqname(const unsigned char *doh, size_t dohlen,
       return DOH_DNS_BAD_LABEL;

     if(dohlen < (*indexp + 1 + length))

       return DOH_DNS_OUT_OF_RANGE;

-    *indexp += 1 + length;

+    *indexp += (unsigned int)(1 + length);

   } while(length);

   return DOH_OK;

 }

@@ -459,14 +456,15 @@ static unsigned short get16bit(const unsigned char *doh, int index)
 

 static unsigned int get32bit(const unsigned char *doh, int index)

 {

-   /* make clang and gcc optimize this to bswap by incrementing

-      the pointer first. */

-   doh += index;

-

-   /* avoid undefined behavior by casting to unsigned before shifting

-      24 bits, possibly into the sign bit. codegen is same, but

-      ub sanitizer won't be upset */

-  return ( (unsigned)doh[0] << 24) | (doh[1] << 16) |(doh[2] << 8) | doh[3];

+  /* make clang and gcc optimize this to bswap by incrementing

+     the pointer first. */

+  doh += index;

+

+  /* avoid undefined behavior by casting to unsigned before shifting

+     24 bits, possibly into the sign bit. codegen is same, but

+     ub sanitizer won't be upset */

+  return ((unsigned)doh[0] << 24) | ((unsigned)doh[1] << 16) |

+         ((unsigned)doh[2] << 8) | doh[3];

 }

 

 static DOHcode store_a(const unsigned char *doh, int index, struct dohentry *d)

@@ -904,7 +902,6 @@ UNITTEST void de_cleanup(struct dohentry *d)
 CURLcode Curl_doh_is_resolved(struct Curl_easy *data,

                               struct Curl_dns_entry **dnsp)

 {

-  struct connectdata *conn = data->conn;

   CURLcode result;

   struct dohdata *dohp = data->req.doh;

   *dnsp = NULL; /* defaults to no response */

@@ -913,7 +910,7 @@ CURLcode Curl_doh_is_resolved(struct Curl_easy *data,
 

   if(!dohp->probe[DOH_PROBE_SLOT_IPADDR_V4].easy &&

      !dohp->probe[DOH_PROBE_SLOT_IPADDR_V6].easy) {

-    failf(data, "Could not DoH-resolve: %s", conn->resolve_async.hostname);

+    failf(data, "Could not DoH-resolve: %s", data->state.async.hostname);

     return CONN_IS_PROXIED(data->conn)?CURLE_COULDNT_RESOLVE_PROXY:

       CURLE_COULDNT_RESOLVE_HOST;

   }

@@ -976,7 +973,7 @@ CURLcode Curl_doh_is_resolved(struct Curl_easy *data,
         Curl_freeaddrinfo(ai);

       }

       else {

-        conn->resolve_async.dns = dns;

+        data->state.async.dns = dns;

         *dnsp = dns;

         result = CURLE_OK;      /* address resolution OK */

       }