diff options
| author | Christian Hopps <chopps@labn.net> | 2024-03-04 22:45:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-04 22:45:02 -0500 |
| commit | 21aa86319cd34ff2d113c9730f4cf960ee25c6da (patch) | |
| tree | 8371dd1e1a9198441609ba22b5ca37635063569c | |
| parent | c256a9a40a42d617ace08cfd7c7447e7cb705e38 (diff) | |
| parent | cb6032d6b3d9fc1198f61ac343ec22b456a8896e (diff) | |
Merge pull request #15470 from idryzhov/fix-darr-vsprintf
lib: fix __darr_in_vsprintf
| -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); |