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 | 9439b17ad17f65af8369e926cb8fdadc175b334e (patch) | |
| tree | fde53e884662b797075dcc98ad13b3cf623fae06 | |
| parent | ddef7a14d6df8bc9daf898314ff7384cac18de34 (diff) | |
| download | mandoc-9439b17ad17f65af8369e926cb8fdadc175b334e.tar.gz mandoc-9439b17ad17f65af8369e926cb8fdadc175b334e.tar.zst mandoc-9439b17ad17f65af8369e926cb8fdadc175b334e.zip | |
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 | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/compat_vasprintf.c b/compat_vasprintf.c index 9524bc04..f5741427 100644 --- a/compat_vasprintf.c +++ b/compat_vasprintf.c @@ -6,7 +6,7 @@ int dummy; #else -/* $Id: compat_vasprintf.c,v 1.1 2015/03/19 14:57:29 schwarze Exp $ */ +/* $Id: compat_vasprintf.c,v 1.2 2015/03/20 15:25:12 schwarze Exp $ */ /* * Copyright (c) 2015 Ingo Schwarze <schwarze@openbsd.org> * @@ -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); |