r11958: - fixed memory leaks in the ldb_result handling in ldb operations

- removed an unnecessary level of pointer in ldb_search structure
(This used to be commit b8d4afb14a18dfd8bac79882a035e74d3ed312bd)

2 files changed, 30 insertions, 24 deletions

diff --git a/source4/lib/ldb/modules/ldb_map.c b/source4/lib/ldb/modules/ldb_map.c
index 49261d155c..b056521f9f 100644
--- a/source4/lib/ldb/modules/ldb_map.c
+++ b/source4/lib/ldb/modules/ldb_map.c
@@ -786,7 +786,7 @@ static int map_search_mp(struct ldb_module *module, struct ldb_request *req)
 	enum ldb_scope scope = req->op.search.scope;
 	struct ldb_parse_tree *tree = req->op.search.tree;
 	const char * const *attrs = req->op.search.attrs;
-	struct ldb_result **res = req->op.search.res;
+	struct ldb_result *res;
 	struct ldb_request new_req;
 	struct ldb_parse_tree *new_tree;
 	struct ldb_dn *new_base;
@@ -818,9 +818,11 @@ static int map_search_mp(struct ldb_module *module, struct ldb_request *req)
 	new_req.op.search.scope = scope;
 	new_req.op.search.tree = new_tree;
 	new_req.op.search.attrs = newattrs;
-	new_req.op.search.res = &newres;
+
 	mpret = ldb_request(privdat->mapped_ldb, req);
 
+	newres = new_req.op.search.res;
+
 	talloc_free(new_base);
 	talloc_free(new_tree);
 	talloc_free(newattrs);
@@ -835,9 +837,10 @@ static int map_search_mp(struct ldb_module *module, struct ldb_request *req)
 	 - test if (full expression) is now true
 	*/
 
-	*res = talloc(module, struct ldb_result);
-	(*res)->msgs = talloc_array(module, struct ldb_message *, newres->count);
-	(*res)->count = newres->count;
+	res = talloc(module, struct ldb_result);
+	req->op.search.res = res;
+	res->msgs = talloc_array(module, struct ldb_message *, newres->count);
+	res->count = newres->count;
 
 	ret = 0;
 
@@ -860,10 +863,11 @@ static int map_search_mp(struct ldb_module *module, struct ldb_request *req)
 		mergereq.op.search.scope = LDB_SCOPE_BASE;
 		mergereq.op.search.tree = ldb_parse_tree(module, "");
 		mergereq.op.search.attrs = NULL;
-		mergereq.op.search.res = &extrares;
 
 		extraret = ldb_next_request(module, &mergereq);
 
+		extrares = mergereq.op.search.res;
+
 		if (extraret == -1) {
 			ldb_debug(module->ldb, LDB_DEBUG_ERROR, "Error searching for extra data!\n");
 		} else if (extraret > 1) {
@@ -883,7 +887,7 @@ static int map_search_mp(struct ldb_module *module, struct ldb_request *req)
 		}
 		
 		if (ldb_match_msg(module->ldb, merged, tree, base, scope) != 0) {
-			(*res)->msgs[ret] = merged;
+			res->msgs[ret] = merged;
 			ret++;
 		} else {
 			ldb_debug(module->ldb, LDB_DEBUG_TRACE, "Discarded merged message because it did not match");
@@ -892,7 +896,7 @@ static int map_search_mp(struct ldb_module *module, struct ldb_request *req)
 
 	talloc_free(newres);
 
-	(*res)->count = ret;
+	res->count = ret;
 	return LDB_SUCCESS;
 }
 
@@ -903,39 +907,41 @@ static int map_search_mp(struct ldb_module *module, struct ldb_request *req)
 static int map_search_bytree(struct ldb_module *module, struct ldb_request *req)
 {
 	const struct ldb_dn *base = req->op.search.base;
-	struct ldb_result **res = req->op.search.res;
-	struct ldb_result *fbres, *mpres = NULL;
+	struct ldb_result *fbres, *mpres, *res;
 	int i, ret;
 
-	req->op.search.res = &fbres;
 	ret = map_search_fb(module, req);
-	req->op.search.res = res;
 	if (ret != LDB_SUCCESS)
 		return ret;
 
 	/* special dn's are never mapped.. */
 	if (ldb_dn_is_special(base)) {
-		*res = fbres;
 		return ret;
 	}
 
-	req->op.search.res = &mpres;
+	fbres = req->op.search.res;
+
 	ret = map_search_mp(module, req);
-	req->op.search.res = res;
 	if (ret != LDB_SUCCESS) {
 		return ret;
 	}
 
+	mpres = req->op.search.res;
+
 	/* Merge results */
-	*res = talloc(module, struct ldb_result);
-	(*res)->msgs = talloc_array(*res, struct ldb_message *, fbres->count + mpres->count);
+	res = talloc(module, struct ldb_result);
+	res->msgs = talloc_array(res, struct ldb_message *, fbres->count + mpres->count);
 
 	ldb_debug(module->ldb, LDB_DEBUG_TRACE, "Merging %d mapped and %d fallback messages", mpres->count, fbres->count);
 
-	for (i = 0; i < fbres->count; i++) (*res)->msgs[i] = fbres->msgs[i];
-	for (i = 0; i < mpres->count; i++) (*res)->msgs[fbres->count + i] = mpres->msgs[i];
+	for (i = 0; i < fbres->count; i++) {
+		res->msgs[i] = talloc_steal(res->msgs, fbres->msgs[i]);
+	}
+	for (i = 0; i < mpres->count; i++) {
+		res->msgs[fbres->count + i] = talloc_steal(res->msgs, mpres->msgs[i]);
+	}
 
-	(*res)->count = fbres->count + mpres->count;
+	res->count = fbres->count + mpres->count;
 	return LDB_SUCCESS;
 }
 
diff --git a/source4/lib/ldb/modules/operational.c b/source4/lib/ldb/modules/operational.c
index 7c554e8541..2fdd255e99 100644
--- a/source4/lib/ldb/modules/operational.c
+++ b/source4/lib/ldb/modules/operational.c
@@ -182,7 +182,7 @@ static int operational_search_bytree(struct ldb_module *module, struct ldb_reque
 	const char * const *attrs = req->op.search.attrs;
 	const char **search_attrs = NULL;
 
-	*(req->op.search.res) = NULL;
+	req->op.search.res = NULL;
 
 	/* replace any attributes in the parse tree that are
 	   searchable, but are stored using a different name in the
@@ -225,8 +225,8 @@ static int operational_search_bytree(struct ldb_module *module, struct ldb_reque
 
 	/* for each record returned post-process to add any derived
 	   attributes that have been asked for */
-	for (r = 0; r < (*(req->op.search.res))->count; r++) {
-		if (operational_search_post_process(module, (*(req->op.search.res))->msgs[r], attrs) != 0) {
+	for (r = 0; r < req->op.search.res->count; r++) {
+		if (operational_search_post_process(module, req->op.search.res->msgs[r], attrs) != 0) {
 			goto failed;
 		}
 	}
@@ -237,7 +237,7 @@ static int operational_search_bytree(struct ldb_module *module, struct ldb_reque
 
 failed:
 	talloc_free(search_attrs);
-	talloc_free(*(req->op.search.res));
+	talloc_free(req->op.search.res);
 	ldb_oom(module->ldb);
 	return LDB_ERR_OTHER;
 }