From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 6 Apr 2006 21:09:59 +0000 (+0000)
Subject: Code which doesn't hanlding allocation failure should use
X-Git-Tag: OPENLDAP_REL_ENG_2_3_21~8
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=93379e1798441848236467a6b1894106a14c9960;p=openldap

Code which doesn't hanlding allocation failure should use
ch_ routines, not SLAP_ macros
---

diff --git a/servers/slapd/back-ldif/ldif.c b/servers/slapd/back-ldif/ldif.c
index 568aae2f97..44309c7fcf 100644
--- a/servers/slapd/back-ldif/ldif.c
+++ b/servers/slapd/back-ldif/ldif.c
@@ -356,7 +356,7 @@ static int r_enum_tree(enumCookie *ck, struct berval *path,
 				ck->elen = ENTRY_BUFF_INCREMENT;
 			}
 			if(ck->eind >= ck->elen) { /* grow entries if necessary */	
-				ck->entries = (Entry **) SLAP_REALLOC(ck->entries, sizeof(Entry *) * (ck->elen) * 2);
+				ck->entries = (Entry **) ch_realloc(ck->entries, sizeof(Entry *) * (ck->elen) * 2);
 				ck->elen *= 2;
 			}
 
diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index b50205b9f4..64c7177227 100644
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -99,7 +99,7 @@ static char *v2ref( BerVarray ref, const char *text )
 	len += sizeof("Referral:");
 
 	for( i=0; ref[i].bv_val != NULL; i++ ) {
-		v2 = SLAP_REALLOC( v2, len + ref[i].bv_len + 1 );
+		v2 = ch_realloc( v2, len + ref[i].bv_len + 1 );
 		if( v2 == NULL ) {
 			Debug( LDAP_DEBUG_ANY, "v2ref: SLAP_MALLOC failed", 0, 0, 0 );
 			return NULL;
diff --git a/servers/slapd/value.c b/servers/slapd/value.c
index dbd30cff8f..10f8e00938 100644
--- a/servers/slapd/value.c
+++ b/servers/slapd/value.c
@@ -65,7 +65,7 @@ value_add(
 		for ( n = 0; !BER_BVISNULL( &(*vals)[n] ); n++ ) {
 			;	/* Empty */
 		}
-		*vals = (BerVarray) SLAP_REALLOC( (char *) *vals,
+		*vals = (BerVarray) ch_realloc( (char *) *vals,
 		    (n + nn + 1) * sizeof(struct berval) );
 		if( *vals == NULL ) {
 			Debug(LDAP_DEBUG_TRACE,