summaryrefslogtreecommitdiff
path: root/lib/setopt.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2023-04-11 17:06:54 +0200
committerDaniel Stenberg <daniel@haxx.se>2023-04-13 08:41:40 +0200
commit4cfa5bcc9ad0f7d9650bc98fed11c6189ca4c8b6 (patch)
treeeca6a86df774dea8d386eea13ae9ed0e955f1bac /lib/setopt.c
parent233b4e4589f38fe430af217d97252e32a30e7c31 (diff)
downloadcurl-4cfa5bcc9ad0f7d9650bc98fed11c6189ca4c8b6.tar.gz
urlapi: cleanups
- move host checks together - simplify the scheme parser loop and the end of host name parser - avoid itermediate buffer storing in multiple places - reduce scope for several variables - skip the Curl_dyn_tail() call for speed - detect IPv6 earlier and skip extra checks for such hosts - normalize directly in dynbuf instead of itermediate buffer - split out the IPv6 parser into its own funciton - call the IPv6 parser directly for ipv6 addresses - remove (unused) special treatment of % in host names - junkscan() once in the beginning instead of scattered - make junkscan return error code - remove unused query management from dedotdotify() - make Curl_parse_login_details use memchr - more use of memchr() instead of strchr() and less strlen() calls - make junkscan check and return the URL length An optimized build runs one of my benchmark URL parsing programs ~41% faster using this branch. (compared against the shipped 7.88.1 library in Debian) Closes #10935
Diffstat (limited to 'lib/setopt.c')
-rw-r--r--lib/setopt.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/setopt.c b/lib/setopt.c
index b4ba30764..38f5711e4 100644
--- a/lib/setopt.c
+++ b/lib/setopt.c
@@ -115,7 +115,11 @@ static CURLcode setstropt_userpwd(char *option, char **userp, char **passwdp)
/* Parse the login details if specified. It not then we treat NULL as a hint
to clear the existing data */
if(option) {
- result = Curl_parse_login_details(option, strlen(option),
+ size_t len = strlen(option);
+ if(len > CURL_MAX_INPUT_LENGTH)
+ return CURLE_BAD_FUNCTION_ARGUMENT;
+
+ result = Curl_parse_login_details(option, len,
(userp ? &user : NULL),
(passwdp ? &passwd : NULL),
NULL);