X-Git-Url: https://git.cameronkatri.com/mandoc.git/blobdiff_plain/7ca732f0714b3bdace7b2642923a7a0f4919e2d2..c5e1be4e43835ff8cb2512039246bd4ea5ec4c2e:/compat_vasprintf.c

diff --git a/compat_vasprintf.c b/compat_vasprintf.c
index 9524bc04..9040822b 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.3 2015/10/06 18:32:19 schwarze Exp $	*/
 /*
  * Copyright (c) 2015 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -37,16 +37,20 @@ 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);
+			return sz;
 		free(*ret);
 	}
 	*ret = NULL;
-	return(-1);
+	return -1;
 }
 
 #endif