Plug mutex/rwlock leaks (destroy them)

[openldap] / servers / slapd / result.c

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 3ce9e29bd9820b2b3f5fc1c6c68b7a9bc3dd0361..c984863bc4ae89a21619e99ca60dc923f37a247e 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2009 The OpenLDAP Foundation.
+ * Copyright 1998-2010 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -132,6 +132,50 @@ slap_req2res( ber_tag_t tag )
        return tag;
 }
 
+#ifdef RS_ASSERT
+#elif 0 && defined LDAP_DEVEL /* FIXME: this should not crash. ITS#5340. */
+#define RS_ASSERT assert
+#else
+#define RS_ASSERT(cond) ((void) 0)
+#endif
+
+/* Set rs->sr_entry after obyeing and clearing sr_flags & REP_ENTRY_MASK. */
+void
+rs_replace_entry( Operation *op, SlapReply *rs, slap_overinst *on, Entry *e )
+{
+       slap_mask_t e_flags = rs->sr_flags & REP_ENTRY_MUSTFLUSH;
+
+       if ( e_flags && rs->sr_entry != NULL ) {
+               RS_ASSERT( e_flags != REP_ENTRY_MUSTFLUSH );
+               if ( !(e_flags & REP_ENTRY_MUSTRELEASE) ) {
+                       entry_free( rs->sr_entry );
+               } else if ( on != NULL ) {
+                       overlay_entry_release_ov( op, rs->sr_entry, 0, on );
+               } else {
+                       be_entry_release_rw( op, rs->sr_entry, 0 );
+               }
+       }
+       rs->sr_flags &= ~REP_ENTRY_MASK;
+       rs->sr_entry = e;
+}
+
+/*
+ * Ensure rs->sr_entry is modifiable, by duplicating it if necessary.
+ * Obey sr_flags.  Set REP_ENTRY_<MODIFIABLE, and MUSTBEFREED if duplicated>.
+ * Return nonzero if rs->sr_entry was replaced.
+ */
+int
+rs_ensure_entry_modifiable( Operation *op, SlapReply *rs, slap_overinst *on )
+{
+       if ( rs->sr_flags & REP_ENTRY_MODIFIABLE ) {
+               RS_ASSERT((rs->sr_flags & REP_ENTRY_MUSTFLUSH)==REP_ENTRY_MUSTBEFREED);
+               return 0;
+       }
+       rs_replace_entry( op, rs, on, entry_dup( rs->sr_entry ));
+       rs->sr_flags |= REP_ENTRY_MODIFIABLE | REP_ENTRY_MUSTBEFREED;
+       return 1;
+}
+
 static long send_ldap_ber(
        Operation *op,
        BerElement *ber )
@@ -302,11 +346,11 @@ send_ldap_controls( Operation *o, BerElement *ber, LDAPControl **c )
 
                ber_printf( sber, "{e}", LDAP_UNWILLING_TO_PERFORM );
 
-               if( ber_flatten2( ber, &sorted.ldctl_value, 0 ) == -1 ) {
+               if( ber_flatten2( sber, &sorted.ldctl_value, 0 ) == -1 ) {
                        return -1;
                }
 
-               (void) ber_free_buf( ber );
+               (void) ber_free_buf( sber );
 
                rc = send_ldap_control( ber, &sorted );
                if( rc == -1 ) return rc;
@@ -616,6 +660,7 @@ send_ldap_disconnect( Operation     *op, SlapReply *rs )
        assert( LDAP_UNSOLICITED_ERROR( rs->sr_err ) );
 
        rs->sr_type = REP_EXTENDED;
+       rs->sr_rspdata = NULL;
 
        Debug( LDAP_DEBUG_TRACE,
                "send_ldap_disconnect %d:%s\n",
@@ -926,7 +971,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                        if( e_flags == NULL ) {
                        Debug( LDAP_DEBUG_ANY, 
                                        "send_search_entry: conn %lu slap_sl_calloc failed\n",
-                                       op->o_connid ? op->o_connid : 0, 0, 0 );
+                                       op->o_connid, 0, 0 );
                                ber_free( ber, 1 );
        
                                send_ldap_error( op, rs, LDAP_OTHER, "out of memory" );
@@ -944,7 +989,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                        if ( rc == -1 ) {
                                Debug( LDAP_DEBUG_ANY, "send_search_entry: "
                                        "conn %lu matched values filtering failed\n",
-                                       op->o_connid ? op->o_connid : 0, 0, 0 );
+                                       op->o_connid, 0, 0 );
                                if ( op->o_res_ber == NULL ) ber_free_buf( ber );
                                send_ldap_error( op, rs, LDAP_OTHER,
                                        "matched values filtering error" );
@@ -1111,7 +1156,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                                Debug( LDAP_DEBUG_ANY,
                                        "send_search_entry: conn %lu "
                                        "matched values filtering failed\n", 
-                                       op->o_connid ? op->o_connid : 0, 0, 0);
+                                       op->o_connid, 0, 0);
                                if ( op->o_res_ber == NULL ) ber_free_buf( ber );
                                send_ldap_error( op, rs, LDAP_OTHER,
                                        "matched values filtering error" );
@@ -1311,6 +1356,14 @@ error_return:;
                rs->sr_flags &= ~REP_ENTRY_MUSTBEFREED;
        }
 
+       if ( rs->sr_flags & REP_CTRLS_MUSTBEFREED ) {
+               rs->sr_flags ^= REP_CTRLS_MUSTBEFREED; /* paranoia */
+               if ( rs->sr_ctrls ) {
+                       slap_free_ctrls( op, rs->sr_ctrls );
+                       rs->sr_ctrls = NULL;
+               }
+       }
+
        return( rc );
 }
 
@@ -1465,6 +1518,14 @@ rel:
                (void)slap_cleanup_play( op, rs );
        }
 
+       if ( rs->sr_flags & REP_CTRLS_MUSTBEFREED ) {
+               rs->sr_flags ^= REP_CTRLS_MUSTBEFREED; /* paranoia */
+               if ( rs->sr_ctrls ) {
+                       slap_free_ctrls( op, rs->sr_ctrls );
+                       rs->sr_ctrls = NULL;
+               }
+       }
+
        return rc;
 }