From: Howard Chu <hyc@openldap.org>
Date: Fri, 20 Feb 2009 02:01:07 +0000 (+0000)
Subject: ITS#5959, cleanup
X-Git-Tag: ACLCHECK_0~796
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=384f23f59d4f586c82d2626dde5ebf72518e73be;p=openldap

ITS#5959, cleanup
---

diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index b82a8429d5..a094de66ed 100644
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -1222,7 +1222,7 @@ really_bad:;
 					 * are passed without checks */
 					rs->sr_err = ldap_parse_intermediate( msc->msc_ld,
 						msg,
-						&rs->sr_rspoid,
+						(char **)&rs->sr_rspoid,
 						&rs->sr_rspdata,
 						&rs->sr_ctrls,
 						0 );
@@ -1236,7 +1236,7 @@ really_bad:;
 					slap_send_ldap_intermediate( op, rs );
 
 					if ( rs->sr_rspoid != NULL ) {
-						ber_memfree( rs->sr_rspoid );
+						ber_memfree( (char *)rs->sr_rspoid );
 						rs->sr_rspoid = NULL;
 					}
 
@@ -2097,11 +2097,11 @@ remove_oc:;
 					i--;
 				}
 			}
-			if ( last == 0 && attr->a_vals != &slap_dummy_bv ) {
+			BER_BVZERO( &attr->a_nvals[i] );
+			if ( last == 0 ) {
 				attr_free( attr );
 				goto next_attr;
 			}
-			BER_BVZERO( &attr->a_nvals[i] );
 
 		} else {
 			attr->a_nvals = attr->a_vals;