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

lib: eliminate size_t casts

Browse source 
Add new functions in `curlx/warnless.h` for controlled type
conversions:

* curlx_uitouz, convert unsigned into to size_t (should always work)
* curlx_uztoso, convert size_t to curl_off_t, capping at CURL_OFF_T_MAX
* curlx_sztouz, convert ssize_t to size_t, return TRUE when ok
* curlx_sotouz_range, convert curl_off_t to size_t interval, capping
  values to interval bounds

Remove some unnecesary casts, convert some internal recv functions
to the "return result, have size_t* arg" pattern.

Closes #19495
This commit is contained in:
Stefan Eissing 2025-11-12 15:58:49 +01:00 • committed by Daniel Stenberg
parent 78a610cb83
commit cb2bcb681f
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
13 changed files with 170 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

35
lib/curlx/warnless.c
View file

@ -290,3 +290,38 @@ size_t curlx_sitouz(int sinum)
# pragma warning(pop)
#endif
}
size_t curlx_uitouz(unsigned int uinum)
{
return (size_t)uinum;
}
size_t curlx_sotouz_range(curl_off_t sonum, size_t uzmin, size_t uzmax)
{
if(sonum < 0)
return uzmin;
#if SIZEOF_CURL_OFF_T > SIZEOF_SIZE_T
if(sonum > SIZE_MAX)
return uzmax;
#endif
return CURLMIN(CURLMAX((size_t)sonum, uzmin), uzmax);
}
bool curlx_sztouz(ssize_t sznum, size_t *puznum)
{
if(sznum < 0) {
*puznum = 0;
return FALSE;
}
*puznum = (size_t)sznum;
return TRUE;
}
curl_off_t curlx_uztoso(size_t uznum)
{
#if SIZEOF_SIZE_T >= SIZEOF_CURL_OFF_T
if(uznum > (size_t)CURL_OFF_T_MAX)
return CURL_OFF_T_MAX;
#endif
return (curl_off_t)uznum;
}

12
lib/curlx/warnless.h
View file

@ -57,6 +57,18 @@ unsigned short curlx_uitous(unsigned int uinum);
size_t curlx_sitouz(int sinum);
size_t curlx_uitouz(unsigned int uinum);
/* Convert a curl_off_t to fit into size_t interval [uzmin, uzmax].
* values outside this interval give the lower/upper bound. */
size_t curlx_sotouz_range(curl_off_t sonum, size_t uzmin, size_t uzmax);
/* Convert a size_t to curl_off_t, return CURL_OFF_T_MAX if too large. */
curl_off_t curlx_uztoso(size_t uznum);
/* Convert a ssize_t to size_t, return FALSE if negative and set 0 */
bool curlx_sztouz(ssize_t sznum, size_t *puznum);
#ifdef _WIN32
#undef read
#define read(fd, buf, count) (ssize_t)_read(fd, buf, curlx_uztoui(count))