sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-24 02:04:21 +03:00
Code

r25981: Don't create an ldb_request on NULL.

Browse Source 
A re-arrangment of the code due to the base DN checking meant that the
ac->down_req array wasn't started, so was NULL

Andrew Bartlett
(This used to be commit 0a44b8e9f3e1a85c27d105cdd1572a0df936f612)
This commit is contained in:
Andrew Bartlett 2007-11-16 04:18:22 +01:00 committed by Stefan Metzmacher
parent d7e5d3fe27
commit 579eca54b7
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source4/dsdb/samdb/ldb_modules/linked_attributes.c
View File

@ -127,8 +127,18 @@ static int setup_modifies(struct ldb_context *ldb, TALLOC_CTX *mem_ctx,
for (j=0; j < el->num_values; j++) {
struct ldb_message_element *ret_el;
struct ldb_request *new_req;
struct ldb_message *new_msg;
/* Create a spot in the list for the requests */
ac->down_req = talloc_realloc(ac, ac->down_req,
struct ldb_request *, ac->num_requests + 1);
if (!ac->down_req) {
ldb_oom(ldb);
return LDB_ERR_OPERATIONS_ERROR;
}
/* Create the modify request */
struct ldb_message *new_msg = ldb_msg_new(ac->down_req);
new_msg = ldb_msg_new(ac->down_req);
if (!new_msg) {
ldb_oom(ldb);
return LDB_ERR_OPERATIONS_ERROR;
@ -184,13 +194,6 @@ static int setup_modifies(struct ldb_context *ldb, TALLOC_CTX *mem_ctx,
ldb_set_timeout_from_prev_req(ldb, ac->orig_req, new_req);
/* Now add it to the list */
ac->down_req = talloc_realloc(ac, ac->down_req,
struct ldb_request *, ac->num_requests + 1);
if (!ac->down_req) {
ldb_oom(ldb);
return LDB_ERR_OPERATIONS_ERROR;
}
ac->down_req[ac->num_requests] = new_req;
ac->num_requests++;