X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Futf-8-conv.c;h=bb977a3f3c559aef17d041b1e5279a7a0c685198;hb=fff5d3de601a7a980cf7554e3f2e6f4d7ceda834;hp=bdd43bcb06107cb7895e15fc7871009284c268b7;hpb=52067f461e3f1abce8734cea878d8aad1cf0be67;p=openldap

diff --git a/libraries/libldap/utf-8-conv.c b/libraries/libldap/utf-8-conv.c
index bdd43bcb06..bb977a3f3c 100644
--- a/libraries/libldap/utf-8-conv.c
+++ b/libraries/libldap/utf-8-conv.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 2000-2001 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -85,7 +85,7 @@ ldap_x_utf8_to_wc ( wchar_t *wchar, const char *utf8char )
 		utf8char = "";
 
 	/* Get UTF-8 sequence length from 1st byte */
-	utflen = LDAP_UTF8_CHARLEN(utf8char);
+	utflen = LDAP_UTF8_CHARLEN2(utf8char, utflen);
 	
 	if( utflen==0 || utflen > LDAP_MAX_UTF8_LEN )
 		return -1;								 	/* Invalid input */
@@ -130,7 +130,7 @@ ldap_x_utf8s_to_wcs ( wchar_t *wcstr, const char *utf8str, size_t count )
 	while ( *utf8str && (wcstr==NULL || wclen<count) )
 	{
 		/* Get UTF-8 sequence length from 1st byte */
-		utflen = LDAP_UTF8_CHARLEN(utf8str);
+		utflen = LDAP_UTF8_CHARLEN2(utf8str, utflen);
 		
 		if( utflen==0 || utflen > LDAP_MAX_UTF8_LEN )
 			return -1;								 	/* Invalid input */