sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-25 00:23:52 +03:00
Code Activity

r18438: I should have examined these uses of talloc_move() more

Browse Source 
carefully. Most of them are OK, but a couple were not.
This commit is contained in:
Andrew Tridgell
2006-09-13 02:03:20 +00:00
committed by Gerald (Jerry) Carter
parent 4c33c6bb97
commit b0de283882
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/lib/ldb/common/ldb.c
View File

@@ -548,10 +548,7 @@ static int ldb_search_callback(struct ldb_context *ldb, void *context, struct ld
res->refs[n + 1] = NULL; res->refs[n + 1] = NULL;
} }
if (ares->controls) { talloc_steal(res, ares->controls);
res->controls = talloc_move(res, ares->controls);
}
talloc_free(ares); talloc_free(ares);
return LDB_SUCCESS; return LDB_SUCCESS;

2
source/lib/ldb/ldb_ildap/ldb_ildap.c
View File

@@ -381,7 +381,6 @@ static int ildb_request_send(struct ldb_module *module, struct ldap_message *msg
return LDB_ERR_OPERATIONS_ERROR; return LDB_ERR_OPERATIONS_ERROR;
} }
ildb_ac->req = talloc_move(ildb_ac, req);
talloc_free(req->time_event); talloc_free(req->time_event);
req->time_event = NULL; req->time_event = NULL;
if (timeout) { if (timeout) {
@@ -392,6 +391,7 @@ static int ildb_request_send(struct ldb_module *module, struct ldap_message *msg
req->async.fn = ildb_callback; req->async.fn = ildb_callback;
req->async.private_data = (void *)h; req->async.private_data = (void *)h;
ildb_ac->req = talloc_move(ildb_ac, req);
*handle = h; *handle = h;
return LDB_SUCCESS; return LDB_SUCCESS;

8
source/lib/ldb/modules/paged_results.c
View File

@@ -190,7 +190,7 @@ static int paged_search_callback(struct ldb_context *ldb, void *context, struct
ac->store->num_entries++; ac->store->num_entries++;
ac->store->last->r = talloc_move(ac->store->last, ares); ac->store->last->r = talloc_steal(ac->store->last, ares);
ac->store->last->next = NULL; ac->store->last->next = NULL;
} }
@@ -205,14 +205,12 @@ static int paged_search_callback(struct ldb_context *ldb, void *context, struct
goto error; goto error;
} }
ac->store->last_ref->r = talloc_move(ac->store->last, ares); ac->store->last_ref->r = talloc_steal(ac->store->last, ares);
ac->store->last_ref->next = NULL; ac->store->last_ref->next = NULL;
} }
if (ares->type == LDB_REPLY_DONE) { if (ares->type == LDB_REPLY_DONE) {
if (ares->controls) { ac->store->controls = talloc_move(ac->store, ares->controls);
ac->store->controls = talloc_move(ac->store, ares->controls);
}
talloc_free(ares); talloc_free(ares);
} }