fixed conn->name error on connection re-use and enlarged the 'gname' array

to hold 512 bytes (for user+password+hostname)

diff --git a/lib/url.c b/lib/url.c
index 60be9322e5819672f8ef2fe7c7afba8ffc3d63f9..e16766fce88d3aa526041fa03379a32a3989c94d 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -1280,14 +1280,14 @@ static CURLcode CreateConnection(struct SessionHandle *data,
     strcpy(conn->path, "/");
 
     if (2 > sscanf(data->change.url,
-                   "%64[^\n:]://%256[^\n/]%[^\n]",
+                   "%64[^\n:]://%512[^\n/]%[^\n]",
                    conn->protostr, conn->gname, conn->path)) {
       
       /*
        * The URL was badly formatted, let's try the browser-style _without_
        * protocol specified like 'http://'.
        */
-      if((1 > sscanf(data->change.url, "%256[^\n/]%[^\n]",
+      if((1 > sscanf(data->change.url, "%512[^\n/]%[^\n]",
                      conn->gname, conn->path)) ) {
         /*
          * We couldn't even get this format.
@@ -1872,7 +1872,6 @@ static CURLcode CreateConnection(struct SessionHandle *data,
     conn = conn_temp;        /* use this connection from now on */
 
     /* we need these pointers if we speak over a proxy */
-    conn->name = conn->gname;
     conn->hostname = old_conn->gname;
 
     free(conn->path);    /* free the previously allocated path pointer */

diff --git a/lib/urldata.h b/lib/urldata.h
index 7651cce449ac1c44273f83923647cda5a4707d2b..1ccead51943cbcab689d54b3372e3e551387d289 100644 (file)
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -233,7 +233,7 @@ struct connectdata {
   struct sockaddr_in serv_addr;
 #endif
   char protostr[64];  /* store the protocol string in this buffer */
-  char gname[257]; /* store the hostname in this buffer */
+  char gname[513]; /* store the hostname in this buffer */
   char *name;      /* host name pointer to fool around with */
   char *path;      /* allocated buffer to store the URL's path part in */
   char *hostname;  /* hostname to connect, as parsed from url */