diff options
| author | Ingo Schwarze <schwarze@openbsd.org> | 2015-03-20 15:25:12 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2015-03-20 15:25:12 +0000 |
| commit | e288630db51bbfcab093f985392465505099da6d (patch) | |
| tree | 02b2c832450144ee29973a46f7ec98638f134447 | |
| parent | 12a8b42da58bc9593db136d2e84368f28052e735 (diff) | |
| download | mandoc-e288630db51bbfcab093f985392465505099da6d.tar.gz | |
Patch from Christian Neukirchen <chneukirchen at gmail dot com>:
He reports that on some platforms, it is not possible to use the
same va_list twice. So use va_copy(3) for additional safety.
| -rw-r--r-- | compat_vasprintf.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/compat_vasprintf.c b/compat_vasprintf.c index 10113aaa..bfeb96dd 100644 --- a/compat_vasprintf.c +++ b/compat_vasprintf.c @@ -37,10 +37,14 @@ int vasprintf(char **ret, const char *format, va_list ap) { char buf[2]; + va_list ap2; int sz; - if ((sz = vsnprintf(buf, sizeof(buf), format, ap)) != -1 && - (*ret = malloc(sz + 1)) != NULL) { + va_copy(ap2, ap); + sz = vsnprintf(buf, sizeof(buf), format, ap2); + va_end(ap2); + + if (sz != -1 && (*ret = malloc(sz + 1)) != NULL) { if (vsnprintf(*ret, sz + 1, format, ap) == sz) return(sz); free(*ret); |