svn commit: samba r19904 - in
branches/SAMBA_4_0/source/lib/ldb/modules: .
idra at samba.org
idra at samba.org
Sat Nov 25 19:28:09 GMT 2006
Author: idra
Date: 2006-11-25 19:28:09 +0000 (Sat, 25 Nov 2006)
New Revision: 19904
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19904
Log:
port fies from samba3
Modified:
branches/SAMBA_4_0/source/lib/ldb/modules/asq.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/modules/asq.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/modules/asq.c 2006-11-25 19:27:42 UTC (rev 19903)
+++ branches/SAMBA_4_0/source/lib/ldb/modules/asq.c 2006-11-25 19:28:09 UTC (rev 19904)
@@ -105,6 +105,9 @@
int i;
ac = talloc_get_type(handle->private_data, struct asq_context);
+ if (ac == NULL) {
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
handle->status = LDB_SUCCESS;
handle->state = LDB_ASYNC_DONE;
@@ -159,6 +162,9 @@
}
ac = talloc_get_type(context, struct asq_context);
+ if (ac == NULL) {
+ goto error;
+ }
/* we are interested only in the single reply (base search) we receive here */
if (ares->type == LDB_REPLY_ENTRY) {
@@ -183,6 +189,9 @@
}
ac = talloc_get_type(context, struct asq_context);
+ if (ac == NULL) {
+ goto error;
+ }
/* we are interested only in the single reply (base search) we receive here */
if (ares->type == LDB_REPLY_ENTRY) {
@@ -287,6 +296,9 @@
int i;
ac = talloc_get_type(handle->private_data, struct asq_context);
+ if (ac == NULL) {
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
/* look up the DNs */
if (ac->base_res == NULL) {
@@ -349,8 +361,10 @@
handle->status = LDB_SUCCESS;
ac = talloc_get_type(handle->private_data, struct asq_context);
+ if (ac == NULL) {
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
-
switch (ac->step) {
case ASQ_SEARCH_BASE:
ret = ldb_wait(ac->base_req->handle, LDB_WAIT_NONE);
More information about the samba-cvs
mailing list