riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sock_util: Allow URLs without path as valid

Browse Source 
URLs without a path were treated as invalid, while according to the URL
specification they are valid

Also fixes a missing null terminator in the returned path
This commit is contained in:
Koen Zandberg 2018-07-18 14:38:07 +02:00
parent 3402e3509c
commit 3096823ab4
No known key found for this signature in database
GPG Key ID: 0895A893E6D2985B
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/net/sock/sock_util.c
View File

@ -114,7 +114,7 @@ static char* _find_pathstart(const char *url)
} }
urlpos++; urlpos++;
} }
return NULL; return urlpos;
} }
int sock_urlsplit(const char *url, char *hostport, char *urlpath) int sock_urlsplit(const char *url, char *hostport, char *urlpath)
@ -125,9 +125,6 @@ int sock_urlsplit(const char *url, char *hostport, char *urlpath)
} }
char *pathstart = _find_pathstart(hoststart); char *pathstart = _find_pathstart(hoststart);
if(!pathstart) {
return -EINVAL;
}
memcpy(hostport, hoststart, pathstart - hoststart); memcpy(hostport, hoststart, pathstart - hoststart);
@ -135,9 +132,7 @@ int sock_urlsplit(const char *url, char *hostport, char *urlpath)
if (pathlen) { if (pathlen) {
memcpy(urlpath, pathstart, pathlen); memcpy(urlpath, pathstart, pathlen);
} }
else { *(urlpath + pathlen) = '\0';
*urlpath = '\0';
}
return 0; return 0;
} }