mirror of
https://git.openldap.org/openldap/openldap.git
synced 2026-01-04 22:20:28 -05:00
Stop mergers if dup returns NULL.
This commit is contained in:
parent
87675a953d
commit
387186fc33
2 changed files with 5 additions and 1 deletions
|
|
@ -67,6 +67,8 @@ Attribute *attr_dup( Attribute *a )
|
|||
|
||||
for( i=0; a->a_vals[i] != NULL; i++ ) {
|
||||
tmp->a_vals[i] = ber_bvdup( a->a_vals[i] );
|
||||
|
||||
if( tmp->a_vals[i] == NULL ) break;
|
||||
}
|
||||
|
||||
tmp->a_vals[i] = NULL;
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ value_add_fast(
|
|||
for ( i = 0, j = 0; i < naddvals; i++, j++ ) {
|
||||
if ( addvals[i]->bv_len > 0 ) {
|
||||
(*vals)[nvals + j] = ber_bvdup( addvals[i] );
|
||||
if( (*vals)[nvals + j] == NULL ) break;
|
||||
}
|
||||
}
|
||||
(*vals)[nvals + j] = NULL;
|
||||
|
|
@ -72,7 +73,8 @@ value_add(
|
|||
|
||||
for ( i = 0, j = 0; i < nn; i++ ) {
|
||||
if ( addvals[i]->bv_len > 0 ) {
|
||||
(*vals)[n + j++] = ber_bvdup( addvals[i] );
|
||||
(*vals)[n + j] = ber_bvdup( addvals[i] );
|
||||
if( (*vals)[n + j++] == NULL ) break;
|
||||
}
|
||||
}
|
||||
(*vals)[n + j] = NULL;
|
||||
|
|
|
|||
Loading…
Reference in a new issue