ITS#6638

diff --git a/CHANGES b/CHANGES
index 9665e94944e85cbd76fb71ba95d80420af41b89e..2beb452651c7d9ee4b9d6af7035659115d13d1d7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ OpenLDAP 2.4 Change Log
 
 OpenLDAP 2.4.24 Engineering
        Fixed liblber to not close invalid sockets (ITS#6585)
+       Fixed ldapsearch segfault with deref (ITS#6638)
        Fixed slapd acl parsing overflow (ITS#6611)
        Fixed slapd modify to return actual error (ITS#6581)
        Fixed slapd-bdb entry cache delete failure (ITS#6577)

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index f06af7f570efa0fa5f6622c7f4727b2d9627ed17..eb64c37298f18281115a90341a971e17879c7d0c 100644 (file)
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -594,7 +594,7 @@ handle_private_option( int i )
                                exit( EXIT_FAILURE );
                        }
                        for ( ispecs = 0; specs[ ispecs ] != NULL; ispecs++ )
-                               /* count'em */
+                               /* count'em */ ;
 
                        ds = ldap_memcalloc( ispecs + 1, sizeof( LDAPDerefSpec ) );
                        if ( ds == NULL ) {
@@ -1334,6 +1334,9 @@ getNextPage:
        if ( derefval.bv_val != NULL ) {
                ldap_memfree( derefval.bv_val );
        }
+       if ( def_urlpre != NULL ) {
+               ber_memfree( def_urlpre );
+       }
 
        if ( c ) {
                for ( ; save_nctrls-- > 0; ) {