Commit 9da1e112 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#6653

parent 5983162e
...@@ -4,6 +4,7 @@ OpenLDAP 2.4.24 Engineering ...@@ -4,6 +4,7 @@ OpenLDAP 2.4.24 Engineering
Fixed liblber to not close invalid sockets (ITS#6585) Fixed liblber to not close invalid sockets (ITS#6585)
Fixed libldap dnssrv port format specifier (ITS#6644) Fixed libldap dnssrv port format specifier (ITS#6644)
Fixed libldap sasl partial write handling (ITS#6639) Fixed libldap sasl partial write handling (ITS#6639)
Fixed libldap url parsing with NULL host (ITS#6653)
Fixed ldapsearch segfault with deref (ITS#6638) Fixed ldapsearch segfault with deref (ITS#6638)
Fixed slapd acl parsing overflow (ITS#6611) Fixed slapd acl parsing overflow (ITS#6611)
Fixed slapd modify to return actual error (ITS#6581) Fixed slapd modify to return actual error (ITS#6581)
......
...@@ -1425,6 +1425,7 @@ ldap_url_list2hosts (LDAPURLDesc *ludlist) ...@@ -1425,6 +1425,7 @@ ldap_url_list2hosts (LDAPURLDesc *ludlist)
/* figure out how big the string is */ /* figure out how big the string is */
size = 1; /* nul-term */ size = 1; /* nul-term */
for (ludp = ludlist; ludp != NULL; ludp = ludp->lud_next) { for (ludp = ludlist; ludp != NULL; ludp = ludp->lud_next) {
if ( ludp->lud_host == NULL ) continue;
size += strlen(ludp->lud_host) + 1; /* host and space */ size += strlen(ludp->lud_host) + 1; /* host and space */
if (strchr(ludp->lud_host, ':')) /* will add [ ] below */ if (strchr(ludp->lud_host, ':')) /* will add [ ] below */
size += 2; size += 2;
...@@ -1437,6 +1438,7 @@ ldap_url_list2hosts (LDAPURLDesc *ludlist) ...@@ -1437,6 +1438,7 @@ ldap_url_list2hosts (LDAPURLDesc *ludlist)
p = s; p = s;
for (ludp = ludlist; ludp != NULL; ludp = ludp->lud_next) { for (ludp = ludlist; ludp != NULL; ludp = ludp->lud_next) {
if ( ludp->lud_host == NULL ) continue;
if (strchr(ludp->lud_host, ':')) { if (strchr(ludp->lud_host, ':')) {
p += sprintf(p, "[%s]", ludp->lud_host); p += sprintf(p, "[%s]", ludp->lud_host);
} else { } else {
...@@ -1449,7 +1451,7 @@ ldap_url_list2hosts (LDAPURLDesc *ludlist) ...@@ -1449,7 +1451,7 @@ ldap_url_list2hosts (LDAPURLDesc *ludlist)
} }
if (p != s) if (p != s)
p--; /* nuke that extra space */ p--; /* nuke that extra space */
*p = 0; *p = '\0';
return s; return s;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment