summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-06-22 17:01:02 +1000
committerKarolin Seeger <kseeger@samba.org>2013-06-25 11:42:00 +0200
commit1650e8a9a244d0ea029dc0ce88eda277cf2be261 (patch)
tree853b27234f2f442d5895eceed8d3c93b2527944a
parentdf6574ce0f73b9574a95d927c67774a31d07fa6a (diff)
downloadsamba-1650e8a9a244d0ea029dc0ce88eda277cf2be261.tar.gz
ldb: Cope with substring match with no chunks in ldb_filter_from_tree
Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> (cherry picked from commit 1a279f74b72018f0742fc407e0574c9dbd7b7883)
-rw-r--r--lib/ldb/common/ldb_parse.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ldb/common/ldb_parse.c b/lib/ldb/common/ldb_parse.c
index 33e8444be7d..5fa5a74afa9 100644
--- a/lib/ldb/common/ldb_parse.c
+++ b/lib/ldb/common/ldb_parse.c
@@ -748,7 +748,7 @@ char *ldb_filter_from_tree(TALLOC_CTX *mem_ctx, const struct ldb_parse_tree *tre
ret = talloc_asprintf(mem_ctx, "(%s=%s", tree->u.substring.attr,
tree->u.substring.start_with_wildcard?"*":"");
if (ret == NULL) return NULL;
- for (i = 0; tree->u.substring.chunks[i]; i++) {
+ for (i = 0; tree->u.substring.chunks && tree->u.substring.chunks[i]; i++) {
s2 = ldb_binary_encode(mem_ctx, *(tree->u.substring.chunks[i]));
if (s2 == NULL) {
talloc_free(ret);