summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Kroeger <andrew@id10ts.net>2009-06-12 13:01:41 +0200
committerAndrew Bartlett <abartlet@samba.org>2009-06-18 13:49:25 +1000
commit71515ba190e90e0250b9de23b7ba871c1dd44f09 (patch)
tree88217cd2054ab02cbdc88aa9df620112572318e0 /source4
parentefe6552f0c1b2cf7e7f95987e7c808667166a303 (diff)
downloadsamba-71515ba190e90e0250b9de23b7ba871c1dd44f09.tar.gz
samba-71515ba190e90e0250b9de23b7ba871c1dd44f09.tar.bz2
samba-71515ba190e90e0250b9de23b7ba871c1dd44f09.zip
s4: Call va_end() after all va_start()/va_copy() calls.
This corrects the issues reaised in bug #6129, and some others that were not originally identified. It also accounts for some code that was in the original bug report but appears to have since been made common between S3 and S4. Thanks to Erik Hovland <erik@hovland.org> for the original bug report.
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c b/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
index 8acbac4cc3..d0573d389e 100644
--- a/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
+++ b/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
@@ -485,6 +485,7 @@ query_int(const struct lsqlite3_private * lsqlite3,
/* Format the query */
if ((p = sqlite3_vmprintf(pSql, args)) == NULL) {
+ va_end(args);
return SQLITE_NOMEM;
}