/* $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
{
int rc;
ber_tag_t tag;
- ber_len_t len;
+ ber_len_t len = 0;
char *attr;
BerElement *ber;
* us at the first attribute.
*/
- tag = ber_scanf( ber, "{xl{" /*}}*/, &attr, &len );
+ tag = ber_scanf( ber, "{xl{" /*}}*/, &len );
if( tag == LBER_ERROR ) {
ld->ld_errno = LDAP_DECODING_ERROR;
ber_free( ber, 0 );
- return NULL;
- }
-
-#if LDAP_SEQORSET_BAILOUT
- if( len == 0 ) {
return NULL;
}
-#endif
-
-#if LBER_SEQORSET_AVOID_OVERRUN
+
/* set the length to avoid overrun */
rc = ber_set_option( ber, LBER_OPT_REMAINING_BYTES, &len );
if( rc != LBER_OPT_SUCCESS ) {
ber_free( ber, 0 );
return NULL;
}
-#endif
+
+ if ( ber_pvt_ber_remaining( ber ) == 0 ) {
+ assert( len == 0 );
+ ber_free( ber, 0 );
+ return NULL;
+ }
+ assert( len != 0 );
/* snatch the first attribute */
tag = ber_scanf( ber, "{ax}", &attr );
assert( entry != NULL );
assert( ber != NULL );
-#if LDAP_SEQORSET_BAILOUT
if ( ber_pvt_ber_remaining( ber ) == 0 ) {
return NULL;
}
-#endif
/* skip sequence, snarf attribute type, skip values */
tag = ber_scanf( ber, "{ax}", &attr );