}
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 );
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;
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;