upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-03 05:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Harmonize bvptr2obj_copy() with values2obj_copy() - ie. don't fail if NULL

Browse source 
is passed in.
This commit is contained in:
Luke Howard 2004-08-23 03:59:07 +00:00
parent f64de49b9f
commit 253f66041f
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
servers/slapd/slapi/slapi_ops.c
View file

@ -271,7 +271,7 @@ values2obj_copy(
}
for ( i = 0; ppValue[i] != NULL; i++ )
;
; /* EMPTY */
tmpberval = (BerVarray)slapi_ch_malloc( (i+1) * (sizeof(struct berval)) );
if ( tmpberval == NULL ) {
@ -297,19 +297,18 @@ bvptr2obj_copy(
struct berval **bvptr,
BerVarray *bvobj )
{
int rc = LDAP_SUCCESS;
int i;
BerVarray tmpberval;
if ( bvptr == NULL || *bvptr == NULL ) {
return LDAP_OTHER;
if ( bvptr == NULL ) {
*bvobj = NULL;
return LDAP_SUCCESS;
}
for ( i = 0; bvptr != NULL && bvptr[i] != NULL; i++ ) {
for ( i = 0; bvptr[i] != NULL; i++ )
; /* EMPTY */
}
tmpberval = (BerVarray)slapi_ch_malloc( (i + 1)*sizeof(struct berval));
tmpberval = (BerVarray)slapi_ch_malloc( (i + 1) * sizeof(struct berval));
if ( tmpberval == NULL ) {
return LDAP_NO_MEMORY;
}
@ -319,14 +318,13 @@ bvptr2obj_copy(
tmpberval[i].bv_len = bvptr[i]->bv_len;
AC_MEMCPY( tmpberval[i].bv_val, bvptr[i]->bv_val, bvptr[i]->bv_len );
}
tmpberval[i].bv_val = NULL;
tmpberval[i].bv_len = 0;
if ( rc == LDAP_SUCCESS ) {
*bvobj = tmpberval;
}
*bvobj = tmpberval;
return rc;
return LDAP_SUCCESS;
}
/*