From: Howard Chu <hyc@openldap.org>
Date: Mon, 17 Dec 2007 07:11:24 +0000 (+0000)
Subject: Better fix to prev commit
X-Git-Tag: OPENLDAP_REL_ENG_2_4_9~20^2~294
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=33c0301b25edd098eaecfc2a7f68fcee920d08ea;p=openldap

Better fix to prev commit
---

diff --git a/libraries/libldap/url.c b/libraries/libldap/url.c
index 6240efb943..882d21da30 100644
--- a/libraries/libldap/url.c
+++ b/libraries/libldap/url.c
@@ -582,19 +582,17 @@ desc2str_len( LDAPURLDesc *u )
 	len += sep;
 
 	if ( u->lud_port ) {
-		char	buf[LDAP_PVT_INTTYPE_CHARS(int) + 1];
+		unsigned p = u->lud_port;
+		if ( p > 65535 )
+			return -1;
 
-		len += snprintf( buf, sizeof( buf ), ":%d", u->lud_port );
-		if ( u->lud_host && u->lud_host[0] ) {
-			len += strlen( u->lud_host );
-		}
+		len += (p > 999 ? 5 + (p > 9999) : p > 99 ? 4 : 2 + (p > 9));
+	}
 
-	} else {
-		if ( u->lud_host && u->lud_host[0] ) {
-			len += hex_escape_len( u->lud_host, URLESC_SLASH );
-			if ( !is_ipc && strchr( u->lud_host, ':' )) {
-				len += 2;	/* IPv6, [] */
-			}
+	if ( u->lud_host && u->lud_host[0] ) {
+		len += hex_escape_len( u->lud_host, URLESC_SLASH );
+		if ( !is_ipc && strchr( u->lud_host, ':' )) {
+			len += 2;	/* IPv6, [] */
 		}
 	}