trim listed modules

[openldap] / servers / slapd / back-monitor / cache.c

diff --git a/servers/slapd/back-monitor/cache.c b/servers/slapd/back-monitor/cache.c
index 3639dd11a6cc52c8deed40e8a6123bdf047f8cab..f98fb18d081c748bbaf375fe701035abcf56a398 100644 (file)
--- a/servers/slapd/back-monitor/cache.c
+++ b/servers/slapd/back-monitor/cache.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2006 The OpenLDAP Foundation.
+ * Copyright 2001-2007 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -264,7 +264,10 @@ retry:;
                        }
 
                }
-               monitor_cache_release( mi, mc->mc_e );
+
+               if ( mc ) {
+                       monitor_cache_release( mi, mc->mc_e );
+               }
        }
 
        ldap_pvt_thread_mutex_unlock( &mi->mi_cache_mutex );
@@ -402,7 +405,7 @@ monitor_entry_destroy( void *v_mc )
                                monitor_callback_t      *next = cb->mc_next;
 
                                if ( cb->mc_free ) {
-                                       cb->mc_free( mc->mc_e, cb->mc_private );
+                                       (void)cb->mc_free( mc->mc_e, &cb->mc_private );
                                }
                                ch_free( mp->mp_cb );