moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

DONT TOUCH the data->url as it may point to read-only memory!!!

Browse Source
This commit is contained in:
Daniel Stenberg 2001-03-23 08:24:47 +00:00
parent bc5954fe2d
commit 1e14f8d4c7
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/transfer.c
View File

@ -805,10 +805,17 @@ CURLcode Curl_perform(CURL *curl)
char *pathsep; char *pathsep;
char *newest; char *newest;
/* we must make our own copy of the URL to play with, as it may
point to read-only data */
char *url_clone=strdup(data->url);
if(!url_clone)
return CURLE_OUT_OF_MEMORY;
/* protsep points to the start of the host name */ /* protsep points to the start of the host name */
protsep=strstr(data->url, "//"); protsep=strstr(url_clone, "//");
if(!protsep) if(!protsep)
protsep=data->url; protsep=url_clone;
else { else {
port=FALSE; /* we got a full URL and thus we should not obey the port=FALSE; /* we got a full URL and thus we should not obey the
port number that might have been set by the user port number that might have been set by the user
@ -838,15 +845,16 @@ CURLcode Curl_perform(CURL *curl)
*pathsep=0; *pathsep=0;
} }
newest=(char *)malloc( strlen(data->url) + newest=(char *)malloc( strlen(url_clone) +
1 + /* possible slash */ 1 + /* possible slash */
strlen(conn->newurl) + 1/* zero byte */); strlen(conn->newurl) + 1/* zero byte */);
if(!newest) if(!newest)
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
sprintf(newest, "%s%s%s", data->url, ('/' == conn->newurl[0])?"":"/", sprintf(newest, "%s%s%s", url_clone, ('/' == conn->newurl[0])?"":"/",
conn->newurl); conn->newurl);
free(conn->newurl); free(conn->newurl);
free(url_clone);
conn->newurl = newest; conn->newurl = newest;
} }
else { else {