kozorizki/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUILD: log: get rid of non-portable strnlen() func

Browse Source 
In c614fd3b9 ("MINOR: log: add +cbor encoding option"), I wrongly used
strnlen() without noticing that the function is not portable (requires
_POSIX_C_SOURCE >= 2008) and that it was the first occurrence in the
entire project. In fact it is not a hard requirement since it's a pretty
simple function. Thus to restore build compatibility with minimal/older
build systems, let's actually get rid of it and use an equivalent portable
code where needed (we cannot simply rely on strlen() because the string
might not be NULL terminated, we must take upstream len into account).

No backport needed (unless c614fd3b9 gets backported)
This commit is contained in:
Aurelien DARRAGON 2024-05-17 10:24:33 +02:00
parent f18ed8d07e
commit e84c8dee1a
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/log.c
View File

@ -2235,7 +2235,15 @@ static inline char *_lf_text_len(char *dst, const char *src,
* indefinite length text in cbor, because indefinite-length text
* has to be made of multiple chunks of known size as per RFC8949...
*/
len = strnlen(src, len);
{
int _len;
/* strnlen(src, len) portable equivalent: */
for (_len = 0; _len < len && src[_len]; _len++)
;
len = _len;
}
ret = cbor_encode_text(&ctx->encode.cbor, dst, dst + size, src, len);
if (ret == NULL)