upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-17 17:48:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better fix to prev commit

Browse source
This commit is contained in:
Howard Chu 2007-12-17 07:11:24 +00:00
parent e4ffd33f1a
commit 33c0301b25
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libraries/libldap/url.c
View file

@ -582,19 +582,17 @@ desc2str_len( LDAPURLDesc *u )
len += sep; len += sep;
if ( u->lud_port ) { 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 ); len += (p > 999 ? 5 + (p > 9999) : p > 99 ? 4 : 2 + (p > 9));
if ( u->lud_host && u->lud_host[0] ) { }
len += strlen( u->lud_host );
}
} else { if ( u->lud_host && u->lud_host[0] ) {
if ( u->lud_host && u->lud_host[0] ) { len += hex_escape_len( u->lud_host, URLESC_SLASH );
len += hex_escape_len( u->lud_host, URLESC_SLASH ); if ( !is_ipc && strchr( u->lud_host, ':' )) {
if ( !is_ipc && strchr( u->lud_host, ':' )) { len += 2; /* IPv6, [] */
len += 2; /* IPv6, [] */
}
} }
} }