Fix prev commit

[openldap] / libraries / librewrite / session.c

diff --git a/libraries/librewrite/session.c b/libraries/librewrite/session.c
index 3812a27e79dd0949121fbe436cafffb7992da55b..bcec2d401f337243a1c452a8426b5bb4bde08296 100644 (file)
--- a/libraries/librewrite/session.c
+++ b/libraries/librewrite/session.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2005 The OpenLDAP Foundation.
+ * Copyright 2000-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -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,16 @@ 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 )
+{
+       struct rewrite_session  *session = (struct rewrite_session *)v_session;
+
+       ldap_pvt_thread_mutex_lock( &session->ls_mutex );
+       rewrite_session_clean( v_session );
+       free( v_session );
 }
 
 /*
@@ -332,13 +340,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 +356,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 +368,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