import fix to ITS#5090

diff --git a/CHANGES b/CHANGES
index d30f905b7485a284ab54f00b5f760bef10f17da6..3f05686724555b1dd45b5c164031bc5b13c729bf 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ OpenLDAP 2.3.38 Engineering
        Fixed slapd select_backend/ManageDSAit (ITS#4986)
        Fixed slapd integer/pointer types and overflow (ITS#5035)
        Fixed slapd AVA_Sort on multivalued RDNs (ITS#5057)
+       Fixed slapd LDIF parsing error handling (ITS#5090)
        Fixed slapd syncrepl searchbase scope (ITS#5073)
        Fixed slapd-bdb missing index warning (ITS#5037)
        Fixed slapd-bdb Quick index for ID 0 (ITS#5052)

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index b1739d823411c410adf80bcd04bbc373807989dc..5f6b317a47f9c9072799714438ae58a1a65b9493 100644 (file)
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -278,6 +278,14 @@ str2entry2( char *s, int checkvals )
                        if ( i == lines ) break;
                }
 
+               if ( BER_BVISNULL( &vals[i] ) ) {
+                       Debug( LDAP_DEBUG_ANY,
+                               "str2entry: attributeType %s #%d: "
+                               "no values\n", 
+                               ad->ad_cname.bv_val, attr_cnt, 0 );
+                       goto fail;
+               }
+
                if( slapMode & SLAP_TOOL_MODE ) {
                        struct berval pval;
                        slap_syntax_validate_func *validate =