upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#10347 Be explicit about managing attr_bv storage

Browse source
This commit is contained in:
Ondřej Kuzník 2025-06-13 08:06:15 +01:00 committed by Quanah Gibson-Mount
parent dda3ab74db
commit 9496132d28
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
contrib/slapd-modules/comp_match/init.c
View file

@ -322,6 +322,7 @@ comp_convert_asn_to_ldap ( MatchingRule* mr, ComponentSyntaxInfo* csi, struct be
else else
csi->csi_syntax = NULL; csi->csi_syntax = NULL;
BER_BVZERO( bv );
switch ( csi->csi_comp_desc->cd_type_id ) { switch ( csi->csi_comp_desc->cd_type_id ) {
case BASICTYPE_BOOLEAN : case BASICTYPE_BOOLEAN :
@ -428,9 +429,9 @@ comp_convert_asn_to_ldap ( MatchingRule* mr, ComponentSyntaxInfo* csi, struct be
rc = csi->csi_syntax->ssyn_pretty(csi->csi_syntax, bv, &prettied , NULL ); rc = csi->csi_syntax->ssyn_pretty(csi->csi_syntax, bv, &prettied , NULL );
if ( rc != LDAP_SUCCESS ) if ( rc != LDAP_SUCCESS )
return LDAP_INVALID_SYNTAX; return LDAP_INVALID_SYNTAX;
#if 0 if ( bv->bv_val )
free ( bv->bv_val );/*potential memory leak?*/ free( bv->bv_val );
#endif *allocated = 1;
bv->bv_val = prettied.bv_val; bv->bv_val = prettied.bv_val;
bv->bv_len = prettied.bv_len; bv->bv_len = prettied.bv_len;
} }
@ -555,8 +556,12 @@ comp_test_one_component (
struct berval* assert_bv = &ca->ca_ma_value; struct berval* assert_bv = &ca->ca_ma_value;
int allocated = 0; int allocated = 0;
/*Attribute is converted to compatible LDAP encodings*/ /*Attribute is converted to compatible LDAP encodings*/
if ( comp_convert_asn_to_ldap( mr, csi_attr, &attr_bv, &allocated ) != LDAP_SUCCESS ) if ( comp_convert_asn_to_ldap( mr, csi_attr, &attr_bv,
&allocated ) != LDAP_SUCCESS ) {
if ( allocated )
free( attr_bv.bv_val );
return LDAP_INAPPROPRIATE_MATCHING; return LDAP_INAPPROPRIATE_MATCHING;
}
/* extracted component value is not normalized */ /* extracted component value is not normalized */
if ( ca->ca_ma_rule->smr_normalize ) { if ( ca->ca_ma_rule->smr_normalize ) {
rc = ca->ca_ma_rule->smr_normalize ( rc = ca->ca_ma_rule->smr_normalize (