From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 2 Jun 2008 19:20:13 +0000 (+0000)
Subject: ITS#5542
X-Git-Tag: OPENLDAP_REL_ENG_2_4_10~5
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d479c9f8dca2f973bc555227f0156f0d6255ca5a;p=openldap

ITS#5542
---

diff --git a/CHANGES b/CHANGES
index ec13b000fd..bc17e58e63 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,7 @@ OpenLDAP 2.4.10 Engineering
 	Fixed libldap file descriptor leak with SELinux (ITS#5507)
 	Fixed libldap ld_defconn cleanup if it was freed (ITS#5518, ITS#5525)
 	Fixed libldap msgid handling (ITS#5318)
+	Fixed libldap t61 infinite loop (ITS#5542)
 	Fixed libldap_r missing stubs (ITS#5519)
 	Fixed slapd initialization of sr_msgid, rs->sr_tag (ITS#5461)
 	Fixed slapd missing termination of integerFilter keys (ITS#5503)
diff --git a/libraries/libldap/t61.c b/libraries/libldap/t61.c
index 3245c42fc5..e5c89bf811 100644
--- a/libraries/libldap/t61.c
+++ b/libraries/libldap/t61.c
@@ -684,6 +684,8 @@ int ldap_utf8s_to_t61s( struct berval *src, struct berval *dst )
 			*d++ = 0x3f;
 			break;
 		}
+		i += j;
+		c += j;
 	}
 	*d = '\0';
 	return LDAP_SUCCESS;