ITS#5300

diff --git a/CHANGES b/CHANGES
index 25aa47761dc163cafa6d03ba8b1bcb7660b66a0f..f2b98d85b7c36807626308f3756978849f87e15d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ OpenLDAP 2.4 Change Log
 
 OpenLDAP 2.4.8 Engineering
        Fixed ldapmodify verbose logging (ITS#5247)
+       Fixed libldap filter abort (ITS#5300)
        Fixed libldap ldap_parse_sasl_bind_result (ITS#5263)
        Fixed libldap search timeout crash (ITS#5291)
        Fixed ldapdelete with sizelimit (ITS#5294)

diff --git a/libraries/libldap/filter.c b/libraries/libldap/filter.c
index 6709540885ea4080d5b5431536588afd6201e46c..3ad77c4fdb8799d7bcfb479674cf1f0eb99e8b14 100644 (file)
--- a/libraries/libldap/filter.c
+++ b/libraries/libldap/filter.c
@@ -751,10 +751,12 @@ put_substring_filter( BerElement *ber, char *type, char *val )
                        }
                }
 
-               if ( *val != '\0' || ftype == LDAP_SUBSTRING_ANY ) {
+               if ( *val == '\0' ) {
+                       return -1;
+               } else {
                        ber_slen_t len = ldap_pvt_filter_value_unescape( val );
 
-                       if ( len < 0  ) {
+                       if ( len <= 0  ) {
                                return -1;
                        }