From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Wed, 18 Nov 2009 02:03:02 +0000 (+0000)
Subject: Minor cleanup in strval2str
X-Git-Tag: OPENLDAP_REL_ENG_2_4_20~48
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6f625b49ed93e74eb5e200f78102bdca2da02de2;p=openldap

Minor cleanup in strval2str
---

diff --git a/libraries/libldap/getdn.c b/libraries/libldap/getdn.c
index 306063d53c..540c2d2672 100644
--- a/libraries/libldap/getdn.c
+++ b/libraries/libldap/getdn.c
@@ -2131,10 +2131,8 @@ strval2str( struct berval *val, char *str, unsigned flags, ber_len_t *len )
 		
 		/*
 		 * The length was checked in strval2strlen();
-		 * LDAP_UTF8_CHARLEN() should suffice
 		 */
-		cl = LDAP_UTF8_CHARLEN2( &val->bv_val[ s ], cl );
-		assert( cl > 0 );
+		cl = LDAP_UTF8_CHARLEN( &val->bv_val[ s ] );
 		
 		/* 
 		 * there might be some chars we want to escape in form