From fcba89a629e67e7756f9a6e650e8a08f7f145696 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Sat, 30 Sep 2000 18:32:28 +0000
Subject: [PATCH] ITS#778: fix first/next attr

---
 CHANGES                     |  1 +
 libraries/libldap/getattr.c | 70 +++++++++++++++++++++++++++----------
 2 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/CHANGES b/CHANGES
index 597ea9e950..b1b8a35259 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@ OpenLDAP 2.0.X Engineering
 	Fixed slapd caseIgnoreIA5string indexing bug (ITS#786)
 	Fixed slurpd TLS initialization bug (ITS#768)
 	Fixed -lldap SASL ctx close bug (ITS#790)
+	Fixed -lldap first/next attribute bug (ITS#778)
 	Updated -llber bprint routine
 	Build Environment
 		Fixed IPv6 detection (ITS#669,ITS#770)
diff --git a/libraries/libldap/getattr.c b/libraries/libldap/getattr.c
index 79fe0a4ad0..5ffc1fa81e 100644
--- a/libraries/libldap/getattr.c
+++ b/libraries/libldap/getattr.c
@@ -22,45 +22,73 @@
 #include "ldap-int.h"
 
 char *
-ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **ber )
+ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **berout )
 {
+	int rc;
+	ber_tag_t tag;
+	ber_len_t len = 0;
 	char *attr;
+	BerElement *ber;
 
 	Debug( LDAP_DEBUG_TRACE, "ldap_first_attribute\n", 0, 0, 0 );
 
 	assert( ld != NULL );
 	assert( LDAP_VALID( ld ) );
 	assert( entry != NULL );
-	assert( ber != NULL );
+	assert( berout != NULL );
+
+	*berout = NULL;
 
-	if ( (*ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
-		*ber = NULL;
-		return( NULL );
+	ber = ldap_alloc_ber_with_options( ld );
+	if( ber == NULL ) {
+		return NULL;
 	}
 
-	**ber = *entry->lm_ber;
+	*ber = *entry->lm_ber;
 
 	/* 
-	 * Skip past the sequence, dn, sequence of sequence, snarf the
-	 * attribute type, and skip the set of values, leaving us
-	 * positioned right before the next attribute type/value sequence.
+	 * Skip past the sequence, dn, sequence of sequence leaving
+	 * us at the first attribute.
 	 */
 
-	if ( ber_scanf( *ber, "{x{{ax}" /*}}*/, &attr )
-	    == LBER_ERROR ) {
+	tag = ber_scanf( ber, "{xl{" /*}}*/, &len );
+	if( tag == LBER_ERROR ) {
 		ld->ld_errno = LDAP_DECODING_ERROR;
-		ber_free( *ber, 0 );
-		*ber = NULL;
-		return( NULL );
+		ber_free( ber, 0 );
+		return NULL;
+	}
+
+	/* 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 );
+		return NULL;
 	}
+	assert( len != 0 );
 
-	return( attr );
+	/* snatch the first attribute */
+	tag = ber_scanf( ber, "{ax}", &attr );
+	if( tag == LBER_ERROR ) {
+		ld->ld_errno = LDAP_DECODING_ERROR;
+		ber_free( ber, 0 );
+		return NULL;
+	}
+
+	*berout = ber;
+	return attr;
 }
 
 /* ARGSUSED */
 char *
 ldap_next_attribute( LDAP *ld, LDAPMessage *entry, BerElement *ber )
 {
+	ber_tag_t tag;
 	char *attr;
 
 	Debug( LDAP_DEBUG_TRACE, "ldap_next_attribute\n", 0, 0, 0 );
@@ -70,12 +98,16 @@ ldap_next_attribute( LDAP *ld, LDAPMessage *entry, BerElement *ber )
 	assert( entry != NULL );
 	assert( ber != NULL );
 
+	if ( ber_pvt_ber_remaining( ber ) == 0 ) {
+		return NULL;
+	}
+
 	/* skip sequence, snarf attribute type, skip values */
-	if ( ber_scanf( ber, "{ax}", &attr ) 
-	    == LBER_ERROR ) {
+	tag = ber_scanf( ber, "{ax}", &attr ); 
+	if( tag == LBER_ERROR ) {
 		ld->ld_errno = LDAP_DECODING_ERROR;
-		return( NULL );
+		return NULL;
 	}
 
-	return( attr );
+	return attr;
 }
-- 
2.39.5