romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-23 18:57:18 +03:00
Code Issues Projects Releases Packages Wiki Activity

strparse: make curlx_str_until() accept zero for 'max'

Browse source 
When asked to parse for a string with max zero bytes, it will always
return error and no longer trigger an assert. This saves the caller from
having to check for this condition.

Closes #21600
This commit is contained in:
Daniel Stenberg 2026-05-14 00:06:03 +02:00
parent de28c9cfad
commit 71430e87fd
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/curlx/strparse.c
View file

@ -45,7 +45,7 @@ void curlx_str_trim(struct Curl_str *out, size_t len)
}
/* Get a word until the first DELIM or end of string. At least one byte long.
return non-zero on error */
return non-zero on error. If 'max' is zero, it will always return error. */
int curlx_str_until(const char **linep, struct Curl_str *out,
const size_t max, char delim)
{
@ -54,7 +54,6 @@ int curlx_str_until(const char **linep, struct Curl_str *out,
DEBUGASSERT(linep);
DEBUGASSERT(*linep);
DEBUGASSERT(out);
DEBUGASSERT(max);
DEBUGASSERT(delim);
s = *linep;