From: Kurt Zeilenga <kurt@openldap.org>
Date: Mon, 21 Dec 1998 17:45:47 +0000 (+0000)
Subject: ITS#12 realBase was being freed before use.   The offending free()
X-Git-Tag: OPENLDAP_SLAPD_BACK_LDAP~899
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2ffb9ae30de63864b79ce898e2360cb1bb65d970;p=openldap

ITS#12 realBase was being freed before use.   The offending free()
call has been removed and additional code added to properly free
realBase variable.  Also fixed leaking of the matched variable.
---

diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index 959411b235..99bebd2248 100644
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -79,7 +79,6 @@ ldbm_back_search(
 	switch ( deref ) {
 	case LDAP_DEREF_FINDING:
 	case LDAP_DEREF_ALWAYS:
-		free (realBase);
 		realBase = derefDN ( be, conn, op, base );
 		break;
 	default:
@@ -110,6 +109,9 @@ ldbm_back_search(
 	default:
 		send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, "",
 		    "Bad scope" );
+		if( realBase != NULL) {
+			free( realBase );
+		}
 		return( -1 );
 	}
 
@@ -119,9 +121,16 @@ ldbm_back_search(
 		if ( matched != NULL ) {
 			free( matched );
 		}
+		if( realBase != NULL) {
+			free( realBase );
+		}
 		return( -1 );
 	}
 
+	if ( matched != NULL ) {
+		free( matched );
+	}
+
 	rmaxsize = 0;
 	nrefs = 0;
 	rbuf = rcur = NULL;
@@ -136,6 +145,9 @@ ldbm_back_search(
 			pthread_mutex_unlock( &op->o_abandonmutex );
 			idl_free( candidates );
 			free( rbuf );
+			if( realBase != NULL) {
+				free( realBase );
+			}
 			return( 0 );
 		}
 		pthread_mutex_unlock( &op->o_abandonmutex );
@@ -150,6 +162,9 @@ ldbm_back_search(
 			    NULL, nentries );
 			idl_free( candidates );
 			free( rbuf );
+			if( realBase != NULL) {
+				free( realBase );
+			}
 			return( 0 );
 		}
 		pthread_mutex_unlock( &currenttime_mutex );
@@ -274,6 +289,10 @@ ldbm_back_search(
 	}
 	free( rbuf );
 
+	if( realBase != NULL) {
+		free( realBase );
+	}
+
 	return( 0 );
 }