X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fgetattr.c;h=91e37b28351ed993818b83e492a46d00d27d798d;hb=3b9f4a82ee478c943a66696adf9133dc9f503e16;hp=3155b45d3e3d1a2b3adc693974425a69b8b1696f;hpb=22d98c85c3ece96dd2e3d9b76195973d0639cd49;p=openldap

diff --git a/libraries/libldap/getattr.c b/libraries/libldap/getattr.c
index 3155b45d3e..91e37b2835 100644
--- a/libraries/libldap/getattr.c
+++ b/libraries/libldap/getattr.c
@@ -1,5 +1,6 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -12,9 +13,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>
@@ -22,58 +22,101 @@
 #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;
+
+#ifdef NEW_LOGGING
+	LDAP_LOG ( OPERATION, ENTRY, "ldap_first_attribute\n", 0, 0, 0 );
+#else
+	Debug( LDAP_DEBUG_TRACE, "ldap_first_attribute\n", 0, 0, 0 );
+#endif
 
 	assert( ld != NULL );
+	assert( LDAP_VALID( ld ) );
 	assert( entry != NULL );
-	assert( ber != NULL );
+	assert( berout != NULL );
 
-	Debug( LDAP_DEBUG_TRACE, "ldap_first_attribute\n", 0, 0, 0 );
+	*berout = NULL;
 
-	if ( (*ber = ldap_alloc_ber_with_options( ld )) == NULLBER ) {
-		*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 );
+		ber_free( ber, 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;
 
+#ifdef NEW_LOGGING
+	LDAP_LOG ( OPERATION, ENTRY, "ldap_next_attribute\n", 0, 0, 0 );
+#else
+	Debug( LDAP_DEBUG_TRACE, "ldap_next_attribute\n", 0, 0, 0 );
+#endif
+
 	assert( ld != NULL );
+	assert( LDAP_VALID( ld ) );
 	assert( entry != NULL );
 	assert( ber != NULL );
 
-	Debug( LDAP_DEBUG_TRACE, "ldap_next_attribute\n", 0, 0, 0 );
+	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;
 }