mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-02-05 13:40:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential attr_merge_normalize() crasher

Browse Source
This commit is contained in:
Luke Howard 2003-04-24 11:14:57 +00:00
parent 375224128e
commit 958942d8e3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
servers/slapd/attr.c
View File

@ -162,10 +162,10 @@ attr_merge_normalize(
BerVarray nvals = NULL;
int rc;
if ( desc->ad_type->sat_equality->smr_normalize ) {
if ( desc->ad_type->sat_equality && desc->ad_type->sat_equality->smr_normalize ) {
int i;
for ( i = 0; vals[i].bv_val; i++);
for ( i = 0; vals[i].bv_val; i++ );
nvals = ch_calloc( sizeof(struct berval), i + 1 );
for ( i = 0; vals[i].bv_val; i++ ) {
@ -186,7 +186,9 @@ attr_merge_normalize(
rc = attr_merge( e, desc, vals, nvals );
error_return:;
ber_bvarray_free( nvals );
if ( nvals != NULL ) {
ber_bvarray_free( nvals );
}
return rc;
}