svn commit: samba r13289 - in branches/SAMBA_4_0/source/lib/ldb: ldb_tdb tools

[idra at samba.org]

Author: idra
Date: 2006-02-01 20:48:05 +0000 (Wed, 01 Feb 2006)
New Revision: 13289

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13289

Log:
Check the tree is not NULL
Thanks to Aaron J. Seigo <aseigo at kde.org> for spotting this


Modified:
   branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_search.c
   branches/SAMBA_4_0/source/lib/ldb/tools/ldbsearch.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_search.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_search.c	2006-02-01 20:31:28 UTC (rev 13288)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_search.c	2006-02-01 20:48:05 UTC (rev 13289)
@@ -473,6 +473,10 @@
 		return -1;
 	}
 
+	if (tree == NULL) {
+		return -1;
+	}
+
 	*res = NULL;
 
 	ret = ltdb_search_indexed(module, base, scope, tree, attrs, res);

Modified: branches/SAMBA_4_0/source/lib/ldb/tools/ldbsearch.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/tools/ldbsearch.c	2006-02-01 20:31:28 UTC (rev 13288)
+++ branches/SAMBA_4_0/source/lib/ldb/tools/ldbsearch.c	2006-02-01 20:48:05 UTC (rev 13289)
@@ -74,6 +74,7 @@
 	req.op.search.base = basedn;
 	req.op.search.scope = options->scope;
 	req.op.search.tree = ldb_parse_tree(ldb, expression);
+	if (req.op.search.tree == NULL) return -1;
 	req.op.search.attrs = attrs;
 	req.op.search.res = NULL;
 	req.controls = parse_controls(ldb, options->controls);