From: Howard Chu <hyc@symas.com>
Date: Fri, 4 Jan 2013 13:09:56 +0000 (-0800)
Subject: ITS#7477 check for invalid LDIF
X-Git-Tag: OPENLDAP_REL_ENG_2_4_34~71
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=23c3effe31dd72e4d752aaef9ab23f2c8525d2b4;p=openldap

ITS#7477 check for invalid LDIF
---

diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index 4f95880ea4..4eaca23935 100644
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -618,6 +618,13 @@ short_input:
 		/* Make sure all attributes with multiple values are contiguous */
 		for (; i<lines; i++) {
 			for (j=i+1; j<lines; j++) {
+				if ( !btype[j].bv_val ) {
+					fprintf( stderr,
+						_("%s: missing attributeDescription (line %d, entry \"%s\")\n"),
+						prog, linenum+j, dn );
+					rc = LDAP_PARAM_ERROR;
+					goto leave;
+				}
 				if ( BV_CASEMATCH( btype+i, btype+j )) {
 					nmods--;
 					/* out of order, move intervening attributes down */