From 6c5c99130462ecddb449e99138c88930003325a3 Mon Sep 17 00:00:00 2001 From: Andrew Kroeger Date: Thu, 11 Jun 2009 02:15:28 -0500 Subject: s3: Call va_end() after all va_start()/va_copy() calls. There are error paths in S3 where va_end() is not properly called after va_start() or va_copy() have been called. These issues were noted while performing an inspection for S4 bug #6129. Thanks to Erik Hovland for the original bug report. --- source3/lib/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/lib/util.c') diff --git a/source3/lib/util.c b/source3/lib/util.c index b85f29e136..c0bb042d28 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -2113,10 +2113,10 @@ void *smb_xmalloc_array(size_t size, unsigned int count) va_copy(ap2, ap); n = vasprintf(ptr, format, ap2); + va_end(ap2); if (n == -1 || ! *ptr) { smb_panic("smb_xvasprintf: out of memory"); } - va_end(ap2); return n; } -- cgit