luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

urlapi: cleanup scheme parsing

Browse Source 
Makea Curl_is_absolute_url() always leave a defined 'buf' and avoids
copying on urls that do not start with a scheme.

Closes #8043
This commit is contained in:
Stefan Eissing 2021-11-22 12:47:56 +01:00 committed by Daniel Stenberg
parent 18270893ab
commit 45bcb2eaa7
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/urlapi.c
View File

@ -235,26 +235,32 @@ static void strcpy_url(char *output, const char *url, bool relative)
bool Curl_is_absolute_url(const char *url, char *buf, size_t buflen) bool Curl_is_absolute_url(const char *url, char *buf, size_t buflen)
{ {
size_t i; size_t i;
if(buf && buflen)
buf[0] = 0; /* always leave a defined value in buf */
#ifdef WIN32 #ifdef WIN32
if(STARTS_WITH_DRIVE_PREFIX(url)) if(STARTS_WITH_DRIVE_PREFIX(url))
return FALSE; return FALSE;
#endif #endif
for(i = 0; i < buflen && url[i]; ++i) { for(i = 0; i < buflen; ++i) {
char s = url[i]; char s = url[i];
if((s == ':') && (url[i + 1] == '/')) { if(s && (ISALNUM(s) || (s == '+') || (s == '-') || (s == '.') )) {
if(buf) /* RFC 3986 3.1 explains:
buf[i] = 0; scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
return TRUE; */
} }
/* RFC 3986 3.1 explains: else {
scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
*/
else if(ISALNUM(s) || (s == '+') || (s == '-') || (s == '.') ) {
if(buf)
buf[i] = (char)TOLOWER(s);
}
else
break; break;
}
}
if(i && (url[i] == ':') && (url[i + 1] == '/')) {
if(buf) {
buf[i] = 0;
while(i--) {
buf[i] = (char)TOLOWER(url[i]);
}
}
return TRUE;
} }
return FALSE; return FALSE;
} }
@ -811,13 +817,13 @@ static CURLUcode seturl(const char *url, CURLU *u, unsigned int flags)
hostname = &path[urllen + 1]; hostname = &path[urllen + 1];
hostname[0] = 0; hostname[0] = 0;
if(Curl_is_absolute_url(url, schemebuf, sizeof(schemebuf))) { if(Curl_is_absolute_url(url, schemebuf, sizeof(schemebuf) - 1)) {
url_has_scheme = TRUE; url_has_scheme = TRUE;
schemelen = strlen(schemebuf); schemelen = strlen(schemebuf);
} }
/* handle the file: scheme */ /* handle the file: scheme */
if(url_has_scheme && strcasecompare(schemebuf, "file")) { if(url_has_scheme && !strcmp(schemebuf, "file")) {
/* path has been allocated large enough to hold this */ /* path has been allocated large enough to hold this */
strcpy(path, &url[5]); strcpy(path, &url[5]);
@ -1520,7 +1526,7 @@ CURLUcode curl_url_set(CURLU *u, CURLUPart what,
char *redired_url; char *redired_url;
CURLU *handle2; CURLU *handle2;
if(Curl_is_absolute_url(part, NULL, MAX_SCHEME_LEN + 1)) { if(Curl_is_absolute_url(part, NULL, MAX_SCHEME_LEN)) {
handle2 = curl_url(); handle2 = curl_url();
if(!handle2) if(!handle2)
return CURLUE_OUT_OF_MEMORY; return CURLUE_OUT_OF_MEMORY;