diff options
| author | Simo Sorce <idra@samba.org> | 2006-02-01 20:48:05 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:51:43 -0500 |
| commit | ab6a39fa4f6442412f3629c4b9b64feeb1e32b19 (patch) | |
| tree | 997ce44f1fb24d8f1047feca3dd413ef9f80aed8 | |
| parent | b9e07af8227a59932e0da1dda1749d490eba958c (diff) | |
| download | samba-ab6a39fa4f6442412f3629c4b9b64feeb1e32b19.tar.gz samba-ab6a39fa4f6442412f3629c4b9b64feeb1e32b19.tar.bz2 samba-ab6a39fa4f6442412f3629c4b9b64feeb1e32b19.zip | |
r13289: Check the tree is not NULL
Thanks to Aaron J. Seigo <aseigo@kde.org> for spotting this
(This used to be commit 4b5c0493e2276a9eba1bada7c4bac99999a465e2)
| -rw-r--r-- | source4/lib/ldb/ldb_tdb/ldb_search.c | 4 | ||||
| -rw-r--r-- | source4/lib/ldb/tools/ldbsearch.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/source4/lib/ldb/ldb_tdb/ldb_search.c b/source4/lib/ldb/ldb_tdb/ldb_search.c index ebbc1a3974..e43125d588 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_search.c +++ b/source4/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/source4/lib/ldb/tools/ldbsearch.c b/source4/lib/ldb/tools/ldbsearch.c index 08a8b7f179..f96c14f5ec 100644 --- a/source4/lib/ldb/tools/ldbsearch.c +++ b/source4/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); |