git-market/curl-curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-11 12:01:42 +08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

base64: accept zero length argument to base64_encode

Browse Source 
We used to treat 0 as "call strlen() to get the length" for
curlx_base64_encode, but it turns out this is rather fragile as we
easily do the mistake of passing in zero when the data is actually not
there and then calling strlen() is wrong.

Force the caller to pass in the correct size. A zero length input string
now returns a zero length output and a NULL pointer.

Closes #18617
This commit is contained in:
Daniel Stenberg 2025-09-19 13:47:16 +02:00
parent a0369e1705
commit 5e2d4d7905
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/curlx/base64.c
View File

@ -182,7 +182,7 @@ static CURLcode base64_encode(const char *table64,
*outlen = 0;
if(!insize)
insize = strlen(inputbuff);
return CURLE_OK;
#if SIZEOF_SIZE_T == 4
if(insize > UINT_MAX/4)
@ -240,8 +240,6 @@ static CURLcode base64_encode(const char *table64,
* encoded data. Size of encoded data is returned in variable pointed by
* outlen.
*
* Input length of 0 indicates input buffer holds a null-terminated string.
*
* Returns CURLE_OK on success, otherwise specific error code. Function
* output shall not be considered valid unless CURLE_OK is returned.
*

2
tests/unit/unit1302.c
View File

@ -172,7 +172,7 @@ static CURLcode test_unit1302(const char *arg)
fprintf(stderr, "Test %u URL encoded output length %d instead of %d\n",
i, (int)olen, (int)e->olen);
}
if(memcmp(out, e->output, e->olen)) {
if(out && memcmp(out, e->output, e->olen)) {
fprintf(stderr, "Test %u URL encoded badly. Got '%s', expected '%s'\n",
i, out, e->output);
unitfail++;