[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha7-2272-g6c5c991
Volker Lendecke
vlendec at samba.org
Fri Jun 12 08:28:36 GMT 2009
The branch, master has been updated
via 6c5c99130462ecddb449e99138c88930003325a3 (commit)
from ff4acca13aa53865182bd26715c92e45f6e8f861 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6c5c99130462ecddb449e99138c88930003325a3
Author: Andrew Kroeger <andrew at id10ts.net>
Date: Thu Jun 11 02:15:28 2009 -0500
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 at hovland.org> for the original bug report.
-----------------------------------------------------------------------
Summary of changes:
source3/lib/ldb/common/ldb_dn.c | 2 +-
source3/lib/ldb/ldb_sqlite3/ldb_sqlite3.c | 1 +
source3/lib/util.c | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/ldb/common/ldb_dn.c b/source3/lib/ldb/common/ldb_dn.c
index 09d5855..fb7f3e9 100644
--- a/source3/lib/ldb/common/ldb_dn.c
+++ b/source3/lib/ldb/common/ldb_dn.c
@@ -362,9 +362,9 @@ struct ldb_dn *ldb_dn_new_fmt(void *mem_ctx, struct ldb_context *ldb, const char
va_start(ap, new_fmt);
strdn = talloc_vasprintf(mem_ctx, new_fmt, ap);
+ va_end(ap);
if (strdn == NULL)
return NULL;
- va_end(ap);
dn = ldb_dn_explode(mem_ctx, strdn);
diff --git a/source3/lib/ldb/ldb_sqlite3/ldb_sqlite3.c b/source3/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
index cb516b6..d8fc162 100644
--- a/source3/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
+++ b/source3/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
@@ -534,6 +534,7 @@ query_int(const struct lsqlite3_private * lsqlite3,
/* Format the query */
if ((p = sqlite3_vmprintf(pSql, args)) == NULL) {
+ va_end(args);
return SQLITE_NOMEM;
}
diff --git a/source3/lib/util.c b/source3/lib/util.c
index b85f29e..c0bb042 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;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list