don't use lud_host when NULL (ITS#6653, fixed differently)

This commit is contained in:
Pierangelo Masarati 2010-09-21 00:05:36 +00:00
parent f58493c3f8
commit 9d77d61314

View File

@ -1425,6 +1425,7 @@ ldap_url_list2hosts (LDAPURLDesc *ludlist)
/* figure out how big the string is */
size = 1; /* nul-term */
for (ludp = ludlist; ludp != NULL; ludp = ludp->lud_next) {
if ( ludp->lud_host == NULL ) continue;
size += strlen(ludp->lud_host) + 1; /* host and space */
if (strchr(ludp->lud_host, ':')) /* will add [ ] below */
size += 2;
@ -1437,6 +1438,7 @@ ldap_url_list2hosts (LDAPURLDesc *ludlist)
p = s;
for (ludp = ludlist; ludp != NULL; ludp = ludp->lud_next) {
if ( ludp->lud_host == NULL ) continue;
if (strchr(ludp->lud_host, ':')) {
p += sprintf(p, "[%s]", ludp->lud_host);
} else {
@ -1449,7 +1451,7 @@ ldap_url_list2hosts (LDAPURLDesc *ludlist)
}
if (p != s)
p--; /* nuke that extra space */
*p = 0;
*p = '\0';
return s;
}