mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-04-18 15:20:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix ldap_get_attribute_ber to get values in-place.

Browse Source 
Revert previous memleak fix in ldapsearch.c
This commit is contained in:
Howard Chu 2003-05-14 13:16:56 +00:00
parent ac7ac5acef
commit 8e8fbe0908
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clients/tools/ldapsearch.c
View File

@ -1367,7 +1367,7 @@ print_entry(
bvals[ i ].bv_val, bvals[ i ].bv_len );
}
}
ber_bvarray_free( bvals );
ber_memfree( bvals );
}
}

10
libraries/libldap/getattr.c
View File

@ -121,7 +121,10 @@ ldap_next_attribute( LDAP *ld, LDAPMessage *entry, BerElement *ber )
return attr;
}
/* Fetch attribute type and optionally fetch values */
/* Fetch attribute type and optionally fetch values. The type
* and values are referenced in-place from the BerElement, they are
* not dup'd into malloc'd memory.
*/
/* ARGSUSED */
int
ldap_get_attribute_ber( LDAP *ld, LDAPMessage *entry, BerElement *ber,
@ -146,8 +149,11 @@ ldap_get_attribute_ber( LDAP *ld, LDAPMessage *entry, BerElement *ber,
attr->bv_len = 0;
if ( ber_pvt_ber_remaining( ber ) ) {
ber_len_t siz = sizeof( BerValue );
/* skip sequence, snarf attribute type */
tag = ber_scanf( ber, vals ? "{mW}" : "{mx}", attr, vals );
tag = ber_scanf( ber, vals ? "{mM}" : "{mx}", attr, vals,
&siz, 0 );
if( tag == LBER_ERROR ) {
rc = ld->ld_errno = LDAP_DECODING_ERROR;
}