bagder: curl/lib url.c,1.469,1.470

Update of /cvsroot/curl/curl/lib
In directory labb:/tmp/cvs-serv6129

Modified Files:
        url.c 
Log Message:
now strdups the cookielist inpointer before passed on, as the cookie function
modifies it


Index: url.c
===================================================================
RCS file: /cvsroot/curl/curl/lib/url.c,v
retrieving revision 1.469
retrieving revision 1.470
diff -u -d -r1.469 -r1.470
--- url.c       27 Jul 2005 22:29:50 -0000      1.469
+++ url.c       28 Jul 2005 21:50:34 -0000      1.470
@@ -780,32 +780,37 @@
   case CURLOPT_COOKIELIST:
     argptr = va_arg(param, char *);
 
-    if (argptr == NULL)
+    if(argptr == NULL)
       break;
 
-    if (strequal(argptr, "ALL")) {
-      if (data->cookies == NULL) {
-        break;
-      }
-      else {
+    if(strequal(argptr, "ALL")) {
+      if(data->cookies) {
         /* clear all cookies */
         Curl_cookie_freelist(data->cookies->cookies);
         data->cookies->cookies = NULL;
-        break;
       }
+      break;
     }
 
-    if (!data->cookies)
+    if(!data->cookies)
       /* if cookie engine was not running, activate it */
       data->cookies = Curl_cookie_init(data, NULL, NULL, TRUE);
 
-    if (checkprefix("Set-Cookie:", argptr))
+    argptr = strdup(argptr);
+    if(!argptr) {
+      result = CURLE_OUT_OF_MEMORY;
+      break;
+    }
+
+    if(checkprefix("Set-Cookie:", argptr))
       /* HTTP Header format line */
       Curl_cookie_add(data, data->cookies, TRUE, argptr + 11, NULL, NULL);
 
     else
       /* Netscape format line */
       Curl_cookie_add(data, data->cookies, FALSE, argptr, NULL, NULL);
+
+    free(argptr);
     break;
 #endif /* CURL_DISABLE_COOKIES */
 

_______________________________________________
http://cool.haxx.se/mailman/listinfo/curl-commits