From 2de30ecd942e05e5416a9f14c91d58324a0bc6eb Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 30 Oct 2007 23:35:04 +0100 Subject: r25755: Fix a couple of memory leaks, in particular a new leak onto the NULL context caused by my objectclass module work. Andrew Bartlett (This used to be commit 2a835d900fee71e4461d5d18e39b4358fa6fdfba) --- source4/lib/ldb/common/ldb_modules.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source4/lib/ldb/common/ldb_modules.c') diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c index 9f94c90c92..87e5b2eeb3 100644 --- a/source4/lib/ldb/common/ldb_modules.c +++ b/source4/lib/ldb/common/ldb_modules.c @@ -347,15 +347,17 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[]) if (modules != NULL) { ret = ldb_load_modules_list(ldb, modules, ldb->modules, &ldb->modules); - talloc_free(modules); if (ret != LDB_SUCCESS) { + talloc_free(mem_ctx); return ret; } } else { ldb_debug(ldb, LDB_DEBUG_TRACE, "No modules specified for this database"); } - return ldb_init_module_chain(ldb, ldb->modules); + ret = ldb_init_module_chain(ldb, ldb->modules); + talloc_free(mem_ctx); + return ret; } /* -- cgit