diff options
| author | Igor Ryzhov <iryzhov@nfware.com> | 2024-03-05 11:23:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-05 11:23:37 +0200 |
| commit | 5e27a213d894becff30d04530bd7c308e09824b5 (patch) | |
| tree | bbed938d83d7bbcc9d1735effc62dd5dfaf02603 /lib/darr.c | |
| parent | a976189dd2568a57e48750bcf6a594d8ab5bd259 (diff) | |
| parent | f23f58a6a4fb9325af1960d96dece6dec8f34fe5 (diff) | |
Merge pull request #15478 from FRRouting/mergify/bp/dev/10.0/pr-15470
lib: fix __darr_in_vsprintf (backport #15470)
Diffstat (limited to 'lib/darr.c')
| -rw-r--r-- | lib/darr.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/darr.c b/lib/darr.c index f7a64fc394..7a01274104 100644 --- a/lib/darr.c +++ b/lib/darr.c @@ -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 capcount = strlen(fmt) + MIN(inlen + 64, 128); ssize_t len; + va_list ap_copy; 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) *darr_append(*sp) = 0; 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) 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; else { darr_ensure_cap(*sp, darr_len(*sp) + (size_t)len); |