ITS#4610 fix.

diff --git a/CHANGES b/CHANGES
index 69f61b6c77eaf2419a73d73701e9e96f3c06c91c..2374cd4c690a3172fca9c0934c5d9aa247af7290 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@ OpenLDAP 2.3 Change Log
 OpenLDAP 2.3.26 Engineering
        Fixed slapd incorrect rebuilding of replica URI (ITS#4633)
        Fixed back-monitor operations order via callbacks (ITS#4631)
+       Fixed libldap dnssrv bug with "not present" positive statement (ITS#4610)
 
 OpenLDAP 2.3.25 Release
        Fixed liblber ber_bvreplace_x argument checks

diff --git a/libraries/libldap/dnssrv.c b/libraries/libldap/dnssrv.c
index 3090c66d4dc5c64301811467b760654434e4245a..3d69b557d1589b6537ecc860bbf7eb17208a08ab 100644 (file)
--- a/libraries/libldap/dnssrv.c
+++ b/libraries/libldap/dnssrv.c
@@ -275,8 +275,12 @@ int ldap_domain2hostlist(
                /* weight = (p[2] << 8) | p[3]; */
                port = (p[4] << 8) | p[5];
 
-               buflen = strlen(host) + sizeof(":65355 ");
-               hostlist = (char *) LDAP_REALLOC(hostlist, cur + buflen);
+               if ( port == 0 || host[ 0 ] == '\0' ) {
+                       goto add_size;
+               }
+
+               buflen = strlen(host) + STRLENOF(":65355 ");
+               hostlist = (char *) LDAP_REALLOC(hostlist, cur + buflen + 1);
                if (hostlist == NULL) {
                    rc = LDAP_NO_MEMORY;
                    goto out;
@@ -287,6 +291,7 @@ int ldap_domain2hostlist(
                }
                cur += sprintf(&hostlist[cur], "%s:%hd", host, port);
            }
+add_size:;
            p += size;
        }
     }