mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

overrun protection doesn't work... hmmm....

Browse Source
This commit is contained in:
Kurt Zeilenga 2000-09-16 01:05:14 +00:00
parent 5cfb3f24a5
commit f4f093054a
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libraries/libldap/getattr.c
View File

@ -24,7 +24,8 @@
char *
ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **berout )
{
ber_tag_t rc;
int rc;
ber_tag_t tag;
ber_len_t len;
char *attr;
BerElement *ber;
@ -36,6 +37,8 @@ ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **berout )
assert( entry != NULL );
assert( berout != NULL );
*berout = NULL;
ber = ldap_alloc_ber_with_options( ld );
if( ber == NULL ) {
return NULL;
@ -48,9 +51,8 @@ ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **berout )
* us at the first attribute.
*/
rc = ber_scanf( ber, "{xl{" /*}}*/, &attr, &len );
if( rc == LBER_ERROR ) {
tag = ber_scanf( ber, "{xl{" /*}}*/, &attr, &len );
if( tag == LBER_ERROR ) {
ld->ld_errno = LDAP_DECODING_ERROR;
ber_free( ber, 0 );
return NULL;
@ -62,18 +64,19 @@ ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **berout )
}
#endif
#if 0
/* set the length to avoid overrun */
rc = ber_set_option( ber, LBER_OPT_REMAINING_BYTES, &len );
if( rc != LBER_OPT_SUCCESS ) {
ld->ld_errno = LDAP_LOCAL_ERROR;
ber_free( ber, 0 );
return NULL;
}
#endif
/* snatch the first attribute */
rc = ber_scanf( ber, "{ax}", &attr );
if( rc == LBER_ERROR ) {
tag = ber_scanf( ber, "{ax}", &attr );
if( tag == LBER_ERROR ) {
ld->ld_errno = LDAP_DECODING_ERROR;
ber_free( ber, 0 );
return NULL;
@ -87,7 +90,7 @@ ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **berout )
char *
ldap_next_attribute( LDAP *ld, LDAPMessage *entry, BerElement *ber )
{
ber_tag_t rc;
ber_tag_t tag;
char *attr;
Debug( LDAP_DEBUG_TRACE, "ldap_next_attribute\n", 0, 0, 0 );
@ -104,8 +107,8 @@ ldap_next_attribute( LDAP *ld, LDAPMessage *entry, BerElement *ber )
#endif
/* skip sequence, snarf attribute type, skip values */
rc = ber_scanf( ber, "{ax}", &attr );
if( rc == LBER_ERROR ) {
tag = ber_scanf( ber, "{ax}", &attr );
if( tag == LBER_ERROR ) {
ld->ld_errno = LDAP_DECODING_ERROR;
return NULL;
}