From: Pierangelo Masarati <ando@openldap.org>
Date: Thu, 3 Nov 2005 11:42:44 +0000 (+0000)
Subject: fix previous commit
X-Git-Tag: OPENLDAP_REL_ENG_2_2_MP~126
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3aca011938d425adb1fed5a4102def2f7f2d7c2a;p=openldap

fix previous commit
---

diff --git a/libraries/librewrite/session.c b/libraries/librewrite/session.c
index 3812a27e79..4fa58f876c 100644
--- a/libraries/librewrite/session.c
+++ b/libraries/librewrite/session.c
@@ -303,7 +303,7 @@ rewrite_session_var_get(
 }
 
 static void
-rewrite_session_free( void *v_session )
+rewrite_session_clean( void *v_session )
 {
 	struct rewrite_session	*session = (struct rewrite_session *)v_session;
 
@@ -319,8 +319,13 @@ rewrite_session_free( void *v_session )
 	ldap_pvt_thread_mutex_unlock( &session->ls_mutex );
 	ldap_pvt_thread_mutex_destroy( &session->ls_mutex );
 #endif /* USE_REWRITE_LDAP_PVT_THREADS */
+}
 
-	free( session );
+static void
+rewrite_session_free( void *v_session )
+{
+	rewrite_session_clean( v_session );
+	free( v_session );
 }
 
 /*
@@ -332,13 +337,11 @@ rewrite_session_delete(
 		const void *cookie
 )
 {
-	struct rewrite_session *session, tmp;
+	struct rewrite_session *session, tmp = { 0 };
 
 	assert( info != NULL );
 	assert( cookie != NULL );
 
-	tmp.ls_cookie = ( void * )cookie;
-	
 	session = rewrite_session_find( info, cookie );
 
 	if ( session == NULL ) {
@@ -350,7 +353,7 @@ rewrite_session_delete(
 		return REWRITE_SUCCESS;
 	}
 
-	rewrite_session_free( session );
+	rewrite_session_clean( session );
 
 #ifdef USE_REWRITE_LDAP_PVT_THREADS
 	ldap_pvt_thread_rdwr_wlock( &info->li_cookies_mutex );
@@ -362,7 +365,9 @@ rewrite_session_delete(
 	/*
 	 * There is nothing to delete in the return value
 	 */
+	tmp.ls_cookie = ( void * )cookie;
 	avl_delete( &info->li_cookies, ( caddr_t )&tmp, rewrite_cookie_cmp );
+
 	free( session );
 
 #ifdef USE_REWRITE_LDAP_PVT_THREADS