Attachment 8992 Details for Bug 9967 – patches cherry-picked from master

[patch] patches cherry-picked from master

0001-ldb-Ensure-not-to-segfault-on-a-filter-such-as-mail.patch (text/plain), 1.21 KB, created by Andrew Bartlett on 2013-06-24 01:56:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Bartlett

Created: 2013-06-24 01:56:01 UTC

Size: 1.21 KB

patch

obsolete

>From ee9f37f3a870ad4f023f03902f2c652b10e474ec Mon Sep 17 00:00:00 2001
>From: Andrew Bartlett <abartlet@samba.org>
>Date: Sat, 15 Jun 2013 16:00:42 +1000
>Subject: [PATCH] ldb: Ensure not to segfault on a filter such as (mail=)
>
>As reported by Robin McCorkell <xenopathic@gmail.com> triggered by
>Mozilla Thunderbird as an LDAP client.
>
>Andrew Bartlett
>
>Signed-off-by: Andrew Bartlett <abartlet@samba.org>
>Reviewed-by: Matthieu Patou <mat@matws.net>
>
>Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
>Autobuild-Date(master): Sat Jun 22 09:33:14 CEST 2013 on sn-devel-104
>(cherry picked from commit 0ee8650d778736a130e914df9e14734ef18e0fb5)
>---
> lib/ldb/common/ldb_match.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
>diff --git a/lib/ldb/common/ldb_match.c b/lib/ldb/common/ldb_match.c
>index 5eee02d..7918aec 100644
>--- a/lib/ldb/common/ldb_match.c
>+++ b/lib/ldb/common/ldb_match.c
>@@ -249,6 +249,11 @@ static int ldb_wildcard_compare(struct ldb_context *ldb,
> 		return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
> 	}
> 
>+	if (tree->u.substring.chunks == NULL) {
>+		*matched = false;
>+		return LDB_SUCCESS;
>+	}
>+
> 	if (a->syntax->canonicalise_fn(ldb, ldb, &value, &val) != 0) {
> 		return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
> 	}
>-- 
>1.7.11.7
>

Flags:

mat: review+

Actions: View

Attachments on bug 9967: 8992 | 8993