Commit 0412eafe authored by Pierangelo Masarati's avatar Pierangelo Masarati
Browse files

fix memory leak (ITS#3862)

parent 4901b587
......@@ -5,7 +5,7 @@ OpenLDAP 2.2.28 Engineering
Fixed back-bdb/hdb - check for BDB TXN patch
Fixed back-hdb nested modrdn bug (ITS#3857)
Fixed back-ldap/meta undefined filter propagation (ITS#3785)
Fixed back-ldap memory leak (ITS#3862)
Fixed back-ldap/meta memory leak (ITS#3862)
Fixed back-meta add w/o parent add (ITS#3804)
Fixed back-meta control propagation bug (ITS#3813)
Fixed syncrepl SASL bind crash (ITS#3792)
......
......@@ -222,9 +222,19 @@ meta_back_db_destroy(
ldap_pvt_thread_mutex_unlock( &li->conn_mutex );
ldap_pvt_thread_mutex_destroy( &li->conn_mutex );
if ( li->rwinfo ) {
#if 0
/* FIXME: needs work */
(void)rewrite_info_delete( li->rwinfo );
#endif
}
free( li );
be->be_private = NULL;
}
free( be->be_private );
return 0;
}
......@@ -39,6 +39,8 @@ meta_back_conn_destroy(
{
struct metainfo *li = ( struct metainfo * )be->be_private;
struct metaconn *lc, lc_curr;
int i;
#ifdef NEW_LOGGING
LDAP_LOG( BACK_META, ENTRY,
......@@ -56,9 +58,14 @@ meta_back_conn_destroy(
meta_back_conn_cmp );
ldap_pvt_thread_mutex_unlock( &li->conn_mutex );
/*
* Cleanup rewrite session
*/
for ( i = 0; i < li->ntargets; ++i ) {
rewrite_session_delete( li->targets[ i ]->rwmap.rwm_rw, conn );
}
if ( lc ) {
int i;
#ifdef NEW_LOGGING
LDAP_LOG( BACK_META, INFO,
"meta_back_conn_destroy: destroying conn %ld\n",
......@@ -77,7 +84,6 @@ meta_back_conn_destroy(
continue;
}
rewrite_session_delete( li->targets[ i ]->rwmap.rwm_rw, conn );
meta_clear_one_candidate( &lc->conns[ i ], 1 );
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment