[SCM] Samba Shared Repository - branch master updated

Andrew Bartlett abartlet at samba.org
Sat Jun 22 01:34:03 MDT 2013


The branch, master has been updated
       via  0ee8650 ldb: Ensure not to segfault on a filter such as (mail=)
      from  bbe09b3 Add missing SMB2/SMB3 share capability flag define

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0ee8650d778736a130e914df9e14734ef18e0fb5
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Sat Jun 15 16:00:42 2013 +1000

    ldb: Ensure not to segfault on a filter such as (mail=)
    
    As reported by Robin McCorkell <xenopathic at gmail.com> triggered by
    Mozilla Thunderbird as an LDAP client.
    
    Andrew Bartlett
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Matthieu Patou <mat at matws.net>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Sat Jun 22 09:33:14 CEST 2013 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 lib/ldb/common/ldb_match.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

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;
 	}


-- 
Samba Shared Repository


More information about the samba-cvs mailing list