Adding missing calls to va_end().

Just a small commit to get a handle on this git thingy.  This patch
fixes some missing calls to va_end() to match various calls to va_start()
and VA_COPY().

Tim.
(This used to be commit ec367f307dff7948722b9ac97beb960efd91991f)

4 files changed, 16 insertions, 2 deletions

diff --git a/source3/lib/dprintf.c b/source3/lib/dprintf.c
index 18b261623e..a3bb5be43a 100644
--- a/source3/lib/dprintf.c
+++ b/source3/lib/dprintf.c
@@ -47,7 +47,10 @@
 
 	lang_msg_free(msgstr);
 
-	if (ret <= 0) return ret;
+	if (ret <= 0) {
+	  va_end(ap2);
+	  return ret;
+	}
 
 	/* now we have the string in unix format, convert it to the display
 	   charset, but beware of it growing */
@@ -56,6 +59,7 @@ again:
 	p2 = (char *)SMB_MALLOC(maxlen);
 	if (!p2) {
 		SAFE_FREE(p);
+		va_end(ap2);
 		return -1;
 	}
 	clen = convert_string(CH_UNIX, CH_DISPLAY, p, ret, p2, maxlen, True);
@@ -72,6 +76,8 @@ again:
 	ret = fwrite(p2, 1, clen, f);
 	SAFE_FREE(p2);
 
+	va_end(ap2);
+
 	return ret;
 }
 
diff --git a/source3/lib/util.c b/source3/lib/util.c
index e5ac3752f5..dba7142bad 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -2431,6 +2431,7 @@ char *smb_xstrndup(const char *s, size_t n)
 	if (n == -1 || ! *ptr) {
 		smb_panic("smb_xvasprintf: out of memory");
 	}
+	va_end(ap2);
 	return n;
 }
 
diff --git a/source3/lib/util_tdb.c b/source3/lib/util_tdb.c
index ce2cb427d1..dd5ebcd7ab 100644
--- a/source3/lib/util_tdb.c
+++ b/source3/lib/util_tdb.c
@@ -656,6 +656,7 @@ int tdb_unpack(const uint8 *buf, int bufsize, const char *fmt, ...)
 	return PTR_DIFF(buf, buf0);
 
  no_space:
+	va_end(ap);
 	return -1;
 }
 
diff --git a/source3/lib/xfile.c b/source3/lib/xfile.c
index c98522200b..ee6e581332 100644
--- a/source3/lib/xfile.c
+++ b/source3/lib/xfile.c
@@ -223,9 +223,15 @@ size_t x_fwrite(const void *p, size_t size, size_t nmemb, XFILE *f)
 	VA_COPY(ap2, ap);
 
 	len = vasprintf(&p, format, ap2);
-	if (len <= 0) return len;
+	if (len <= 0) {
+		va_end(ap2);
+		return len;
+	}
 	ret = x_fwrite(p, 1, len, f);
 	SAFE_FREE(p);
+
+	va_end(ap2);
+
 	return ret;
 }