X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Freferral.c;h=57a46713a50571e025f7ab01fd474fe1af878ec0;hb=4e4818771c26a4c02808130970f2a5e4c216ef52;hp=e9b187a734c76bf5bff6283ee882cae4cdf66a38;hpb=7cdb6866cfbc474450bb6728751f1f1f76280dcd;p=openldap

diff --git a/servers/slapd/referral.c b/servers/slapd/referral.c
index e9b187a734..57a46713a5 100644
--- a/servers/slapd/referral.c
+++ b/servers/slapd/referral.c
@@ -101,7 +101,17 @@ static char * referral_dn_muck(
 			}
 
 			muck.bv_len = ntargetDN.bv_len + nrefDN.bv_len - nbaseDN.bv_len;
-			muck.bv_val = ch_malloc( muck.bv_len + 1 );
+			muck.bv_val = SLAP_MALLOC( muck.bv_len + 1 );
+			if( muck.bv_val == NULL ) {
+#ifdef NEW_LOGGING
+				LDAP_LOG( OPERATION, CRIT, 
+					"referral_dn_muck: SLAP_MALLOC failed\n", 0, 0, 0 );
+#else
+				Debug( LDAP_DEBUG_ANY,
+					"referral_dn_muck: SLAP_MALLOC failed\n", 0, 0, 0 );
+#endif
+				return NULL;
+			}
 
 			strncpy( muck.bv_val, ntargetDN.bv_val,
 				ntargetDN.bv_len-nbaseDN.bv_len );
@@ -225,7 +235,17 @@ BerVarray referral_rewrite(
 
 	if( i < 1 ) return NULL;
 
-	refs = ch_malloc( (i+1) * sizeof( struct berval ) );
+	refs = SLAP_MALLOC( (i+1) * sizeof( struct berval ) );
+	if( refs == NULL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( OPERATION, CRIT, 
+			"referral_rewrite: SLAP_MALLOC failed\n", 0, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_ANY,
+			"referral_rewrite: SLAP_MALLOC failed\n", 0, 0, 0 );
+#endif
+		return NULL;
+	}
 
 	for( iv=in,jv=refs; iv->bv_val != NULL ; iv++ ) {
 		LDAPURLDesc *url;
@@ -294,7 +314,17 @@ BerVarray get_entry_referrals(
 
 	if( i < 1 ) return NULL;
 
-	refs = ch_malloc( (i + 1) * sizeof(struct berval));
+	refs = SLAP_MALLOC( (i + 1) * sizeof(struct berval));
+	if( refs == NULL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( OPERATION, CRIT, 
+			"get_entry_referrals: SLAP_MALLOC failed\n", 0, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_ANY,
+			"get_entry_referrals: SLAP_MALLOC failed\n", 0, 0, 0 );
+#endif
+		return NULL;
+	}
 
 	for( iv=attr->a_vals, jv=refs; iv->bv_val != NULL; iv++ ) {
 		unsigned k;