r13289: Check the tree is not NULL

Thanks to Aaron J. Seigo <aseigo@kde.org> for spotting this

diff --git a/source/lib/ldb/ldb_tdb/ldb_search.c b/source/lib/ldb/ldb_tdb/ldb_search.c
index ebbc1a39749ee79426af50b3e51c9a1869ea9556..e43125d588351c0ddf8be03752b0d02c6a048025 100644 (file)
--- a/source/lib/ldb/ldb_tdb/ldb_search.c
+++ b/source/lib/ldb/ldb_tdb/ldb_search.c
@@ -473,6 +473,10 @@ int ltdb_search_bytree(struct ldb_module *module, const struct ldb_dn *base,
                return -1;
        }
 
+       if (tree == NULL) {
+               return -1;
+       }
+
        *res = NULL;
 
        ret = ltdb_search_indexed(module, base, scope, tree, attrs, res);

diff --git a/source/lib/ldb/tools/ldbsearch.c b/source/lib/ldb/tools/ldbsearch.c
index 08a8b7f179052809571633b9e58d78fb1781566a..f96c14f5ec1d13b0112329dba2521bdfdc3b9f82 100644 (file)
--- a/source/lib/ldb/tools/ldbsearch.c
+++ b/source/lib/ldb/tools/ldbsearch.c
@@ -74,6 +74,7 @@ static int do_search(struct ldb_context *ldb,
        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);