diff options
| author | Igor Ryzhov <iryzhov@nfware.com> | 2024-02-05 19:04:39 +0200 |
|---|---|---|
| committer | Igor Ryzhov <iryzhov@nfware.com> | 2024-03-04 02:24:26 +0200 |
| commit | ee0c1cc1e4b87bde73f1eba3212ab93b1c379c6c (patch) | |
| tree | 3bb2f8dbce0250d7a7284f3ab04048d4372f0d9b /lib | |
| parent | e3bc6e39e4b7c54dbe8784a2f93d98c95441c3d0 (diff) | |
lib: fix __darr_in_vsprintf
If the initial darr capacity is not enough for the output, the `ap` is
reused multiple times, which is wrong, because it may be altered by
`vsnprintf`. Make a copy of `ap` each time instead of reusing.
Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/darr.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/darr.c b/lib/darr.c index f7a64fc394..4f3bd9fb67 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,7 +69,9 @@ 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), fmt, ap_copy); + va_end(ap_copy); if (len < 0) darr_in_strcat(*sp, fmt); else if ((size_t)len < darr_avail(*sp)) |