libcurl: update to 8.7.1

1 files changed, 10 insertions, 23 deletions

diff --git a/libs/libcurl/src/cookie.c b/libs/libcurl/src/cookie.c
index 73ca6282d5..1689f7fa41 100644
--- a/libs/libcurl/src/cookie.c
+++ b/libs/libcurl/src/cookie.c
@@ -426,6 +426,7 @@ static void remove_expired(struct CookieInfo *cookies)
   }

 }

 

+#ifndef USE_LIBPSL

 /* Make sure domain contains a dot or is localhost. */

 static bool bad_domain(const char *domain, size_t len)

 {

@@ -443,6 +444,7 @@ static bool bad_domain(const char *domain, size_t len)
   }

   return TRUE;

 }

+#endif

 

 /*

   RFC 6265 section 4.1.1 says a server should accept this range:

@@ -1040,7 +1042,7 @@ Curl_cookie_add(struct Curl_easy *data,
         Curl_psl_release(data);

       }

       else

-        acceptable = !bad_domain(domain, strlen(domain));

+        infof(data, "libpsl problem, rejecting cookie for satety");

     }

 

     if(!acceptable) {

@@ -1205,7 +1207,6 @@ struct CookieInfo *Curl_cookie_init(struct Curl_easy *data,
                                     bool newsession)

 {

   struct CookieInfo *c;

-  char *line = NULL;

   FILE *handle = NULL;

 

   if(!inc) {

@@ -1241,16 +1242,14 @@ struct CookieInfo *Curl_cookie_init(struct Curl_easy *data,
 

     c->running = FALSE; /* this is not running, this is init */

     if(fp) {

-

-      line = malloc(MAX_COOKIE_LINE);

-      if(!line)

-        goto fail;

-      while(Curl_get_line(line, MAX_COOKIE_LINE, fp)) {

-        char *lineptr = line;

+      struct dynbuf buf;

+      Curl_dyn_init(&buf, MAX_COOKIE_LINE);

+      while(Curl_get_line(&buf, fp)) {

+        char *lineptr = Curl_dyn_ptr(&buf);

         bool headerline = FALSE;

-        if(checkprefix("Set-Cookie:", line)) {

+        if(checkprefix("Set-Cookie:", lineptr)) {

           /* This is a cookie line, get it! */

-          lineptr = &line[11];

+          lineptr += 11;

           headerline = TRUE;

           while(*lineptr && ISBLANK(*lineptr))

             lineptr++;

@@ -1258,7 +1257,7 @@ struct CookieInfo *Curl_cookie_init(struct Curl_easy *data,
 

         Curl_cookie_add(data, c, headerline, TRUE, lineptr, NULL, NULL, TRUE);

       }

-      free(line); /* free the line buffer */

+      Curl_dyn_free(&buf); /* free the line buffer */

 

       /*

        * Remove expired cookies from the hash. We must make sure to run this

@@ -1274,18 +1273,6 @@ struct CookieInfo *Curl_cookie_init(struct Curl_easy *data,
   c->running = TRUE;          /* now, we're running */

 

   return c;

-

-fail:

-  free(line);

-  /*

-   * Only clean up if we allocated it here, as the original could still be in

-   * use by a share handle.

-   */

-  if(!inc)

-    Curl_cookie_cleanup(c);

-  if(handle)

-    fclose(handle);

-  return NULL; /* out of memory */

 }

 

 /*