proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-29 07:35:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #15470 from idryzhov/fix-darr-vsprintf

Browse Source 
lib: fix __darr_in_vsprintf
This commit is contained in:
Christian Hopps 2024-03-04 22:45:02 -05:00 committed by GitHub
commit 21aa86319c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/darr.c
View File

@ -58,6 +58,7 @@ char *__darr_in_vsprintf(char **sp, bool concat, const char *fmt, va_list ap)
size_t inlen = concat ? darr_strlen(*sp) : 0; size_t inlen = concat ? darr_strlen(*sp) : 0;
size_t capcount = strlen(fmt) + MIN(inlen + 64, 128); size_t capcount = strlen(fmt) + MIN(inlen + 64, 128);
ssize_t len; ssize_t len;
va_list ap_copy;
darr_ensure_cap(*sp, capcount); darr_ensure_cap(*sp, capcount);
@ -68,10 +69,12 @@ char *__darr_in_vsprintf(char **sp, bool concat, const char *fmt, va_list ap)
if (darr_len(*sp) == 0) if (darr_len(*sp) == 0)
*darr_append(*sp) = 0; *darr_append(*sp) = 0;
again: again:
len = vsnprintf(darr_last(*sp), darr_avail(*sp), fmt, ap); va_copy(ap_copy, ap);
len = vsnprintf(darr_last(*sp), darr_avail(*sp) + 1, fmt, ap_copy);
va_end(ap_copy);
if (len < 0) if (len < 0)
darr_in_strcat(*sp, fmt); darr_in_strcat(*sp, fmt);
else if ((size_t)len < darr_avail(*sp)) else if ((size_t)len <= darr_avail(*sp))
_darr_len(*sp) += len; _darr_len(*sp) += len;
else { else {
darr_ensure_cap(*sp, darr_len(*sp) + (size_t)len); darr_ensure_cap(*sp, darr_len(*sp) + (size_t)len);