Skip to content
Snippets Groups Projects
Commit 2ffb9ae3 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

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.
parent 0c11b6bb
No related branches found
No related tags found
No related merge requests found
......@@ -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 );
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment