diff options
author | Andrew Tridgell <tridge@samba.org> | 2009-12-04 17:45:38 +1100 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2009-12-04 17:49:19 +1100 |
commit | ced3eef776dd44d0f3e9219f77e2660f9e49fa92 (patch) | |
tree | 727b3afc5c6d8ed6037ffd51532e06dfd214ea96 /source4/dsdb/common | |
parent | 4f6d5d0b865a077185e2441d401709325c3e7304 (diff) | |
download | samba-ced3eef776dd44d0f3e9219f77e2660f9e49fa92.tar.gz samba-ced3eef776dd44d0f3e9219f77e2660f9e49fa92.tar.bz2 samba-ced3eef776dd44d0f3e9219f77e2660f9e49fa92.zip |
s4-drsutil: fixed a memory leak in samdb_search_count
In general functions that don't return any memory should not take a memory context.
Otherwise it is too easy to have a bug like this where memory is leaked
Diffstat (limited to 'source4/dsdb/common')
-rw-r--r-- | source4/dsdb/common/util.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c index feebab8d45..8c9c98201b 100644 --- a/source4/dsdb/common/util.c +++ b/source4/dsdb/common/util.c @@ -187,18 +187,19 @@ struct dom_sid *samdb_search_dom_sid(struct ldb_context *sam_ldb, return the count of the number of records in the sam matching the query */ int samdb_search_count(struct ldb_context *sam_ldb, - TALLOC_CTX *mem_ctx, struct ldb_dn *basedn, - const char *format, ...) _PRINTF_ATTRIBUTE(4,5) + const char *format, ...) _PRINTF_ATTRIBUTE(3,4) { va_list ap; struct ldb_message **res; - const char * const attrs[] = { NULL }; + const char *attrs[] = { NULL }; int ret; + TALLOC_CTX *tmp_ctx = talloc_new(sam_ldb); va_start(ap, format); - ret = gendb_search_v(sam_ldb, mem_ctx, basedn, &res, attrs, format, ap); + ret = gendb_search_v(sam_ldb, tmp_ctx, basedn, &res, attrs, format, ap); va_end(ap); + talloc_free(tmp_ctx); return ret; } |