summaryrefslogtreecommitdiff
path: root/source3/lib/util.c
diff options
context:
space:
mode:
authorAndrew Kroeger <andrew@id10ts.net>2009-06-11 02:15:28 -0500
committerVolker Lendecke <vl@samba.org>2009-06-12 10:29:37 +0200
commit6c5c99130462ecddb449e99138c88930003325a3 (patch)
tree5349bba1ad99cc609da76296d568da7cada27264 /source3/lib/util.c
parentff4acca13aa53865182bd26715c92e45f6e8f861 (diff)
downloadsamba-6c5c99130462ecddb449e99138c88930003325a3.tar.gz
samba-6c5c99130462ecddb449e99138c88930003325a3.tar.bz2
samba-6c5c99130462ecddb449e99138c88930003325a3.zip
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 <erik@hovland.org> for the original bug report.
Diffstat (limited to 'source3/lib/util.c')
-rw-r--r--source3/lib/util.c2
1 files changed, 1 insertions, 1 deletions
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;
}