/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/* Portions
char *
ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **berout )
{
- ber_tag_t rc;
- ber_len_t len;
+ int rc;
+ ber_tag_t tag;
+ ber_len_t len = 0;
char *attr;
BerElement *ber;
assert( entry != NULL );
assert( berout != NULL );
+ *berout = NULL;
+
ber = ldap_alloc_ber_with_options( ld );
if( ber == NULL ) {
return NULL;
* us at the first attribute.
*/
- rc = ber_scanf( ber, "{xl{" /*}}*/, &attr, &len );
-
- if( rc == LBER_ERROR ) {
+ tag = ber_scanf( ber, "{xl{" /*}}*/, &len );
+ if( tag == LBER_ERROR ) {
ld->ld_errno = LDAP_DECODING_ERROR;
ber_free( ber, 0 );
- return NULL;
- }
-
-#if 0
- if( len == 0 ) {
return NULL;
}
-#endif
-
+
/* 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;
}
+ if ( ber_pvt_ber_remaining( ber ) == 0 ) {
+ assert( len == 0 );
+ ber_free( ber, 0 );
+ return NULL;
+ }
+ assert( len != 0 );
+
/* 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;
char *
ldap_next_attribute( LDAP *ld, LDAPMessage *entry, BerElement *ber )
{
- ber_tag_t rc;
+ ber_tag_t tag;
char *attr;
-#if 0
- ber_len_t len;
-#endif
Debug( LDAP_DEBUG_TRACE, "ldap_next_attribute\n", 0, 0, 0 );
assert( entry != NULL );
assert( ber != NULL );
-#if 0
- rc = ber_get_option( ber, LBER_OPT_REMAINING_BYTES, &len );
- if( rc != LDAP_OPT_SUCCESS ) {
- ld->ld_errno = LDAP_LOCAL_ERROR;
+ if ( ber_pvt_ber_remaining( ber ) == 0 ) {
return NULL;
}
- /* we're done */
- if( len == 0 ) return NULL;
-#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;
}