From: Pierangelo Masarati <ando@openldap.org>
Date: Mon, 13 Aug 2007 19:35:03 +0000 (+0000)
Subject: import fix to ITS#5090
X-Git-Tag: OPENLDAP_REL_ENG_2_3_38~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a4877711327d56d4527f02eda5828b9c3933f56;p=thirdparty%2Fopenldap.git

import fix to ITS#5090
---

diff --git a/CHANGES b/CHANGES
index d30f905b74..3f05686724 100644
--- 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 b1739d8234..5f6b317a47 100644
--- 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 =