ITS#1169, plug -lldap result leaks

diff --git a/CHANGES b/CHANGES
index 2b164e4b3a770c0f5293bc44e1bdbbc419511770..b12a7b4fe4929be253557a0dad98085d4b5249c3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,11 @@
 OpenLDAP 1.x Change Log
 
-Changes included in OpenLDAP 1.2.12
+Changes included in OpenLDAP 1.2.12 Engineering
        CVS Tag: OPENLDAP_REL_ENG_1_2
+       Fixed libldap result error memory leak (ITS#1161)
+
+Changes included in OpenLDAP 1.2.12
+       CVS Tag: OPENLDAP_REL_ENG_1_2_12
        Fixed slapd sb_max_incoming bug
        Fixed ldapmodify ldaphost NULL bug
        Fixed ldapsearch uninitialized fp bug

diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c
index c8c7b7126018616a1996ede7691d167461a179a8..8f0dfef296bdc692a394567a065d67dd82db3e8e 100644 (file)
--- a/libraries/libldap/result.c
+++ b/libraries/libldap/result.c
@@ -280,22 +280,24 @@ read1msg( LDAP *ld, int msgid, int all, Sockbuf *sb,
        ldap_set_ber_options( ld, &ber );
 
        /* get the next message */
-       if ( (tag = ber_get_next( sb, &len, &ber ))
-           != LDAP_TAG_MESSAGE ) {
-               ld->ld_errno = (tag == LBER_DEFAULT ? LDAP_SERVER_DOWN :
-                   LDAP_LOCAL_ERROR);
+       if ( (tag = ber_get_next( sb, &len, &ber )) != LDAP_TAG_MESSAGE ) {
+               ld->ld_errno = (tag == LBER_DEFAULT)
+                       ? LDAP_SERVER_DOWN
+                       : LDAP_LOCAL_ERROR;
+               free( ber.ber_buf );
                return( -1 );
        }
 
        /* message id */
        if ( ber_get_int( &ber, &id ) == LBER_ERROR ) {
                ld->ld_errno = LDAP_DECODING_ERROR;
+               free( ber.ber_buf );
                return( -1 );
        }
 
        /* if it's been abandoned, toss it */
        if ( ldap_abandoned( ld, (int)id ) ) {
-               free( ber.ber_buf );    /* gack! */
+               free( ber.ber_buf );
                return( -2 );   /* continue looking */
        }
 
@@ -304,7 +306,7 @@ read1msg( LDAP *ld, int msgid, int all, Sockbuf *sb,
                Debug( LDAP_DEBUG_ANY,
                    "no request for response with msgid %ld (tossing)\n",
                    id, 0, 0 );
-               free( ber.ber_buf );    /* gack! */
+               free( ber.ber_buf );
                return( -2 );   /* continue looking */
        }
        Debug( LDAP_DEBUG_TRACE, "got %s msgid %ld, original id %d\n",
@@ -316,6 +318,7 @@ read1msg( LDAP *ld, int msgid, int all, Sockbuf *sb,
        /* the message type */
        if ( (tag = ber_peek_tag( &ber, &len )) == LBER_ERROR ) {
                ld->ld_errno = LDAP_DECODING_ERROR;
+               free( ber.ber_buf );
                return( -1 );
        }
 
@@ -372,7 +375,7 @@ Debug( LDAP_DEBUG_TRACE,
                                simple_request = ( hadref ? 0 : 1 );
                        } else {
                                /* request with referrals or child request */
-                               free( ber.ber_buf );    /* gack! */
+                               free( ber.ber_buf );
                                ber.ber_buf = NULL;
                        }
 
@@ -416,7 +419,7 @@ lr->lr_res_matched ? lr->lr_res_matched : "" );
        }
 
        if ( ber.ber_buf == NULL ) {
-               return( rc );
+               return rc;
        }
 
 #endif /* LDAP_REFERRALS */
@@ -424,6 +427,7 @@ lr->lr_res_matched ? lr->lr_res_matched : "" );
        if ( (new = (LDAPMessage *) calloc( 1, sizeof(LDAPMessage) ))
            == NULL ) {
                ld->ld_errno = LDAP_NO_MEMORY;
+               free( ber.ber_buf );
                return( -1 );
        }
        new->lm_msgid = (int)id;