X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fgetattr.c;h=1af98813815b67842ac4a2a66cfeb4049c266ad0;hb=64d5725662d33a168055df6db2ea06c366a1d0f1;hp=8e655da12efea0cb1aeb4a518ccc0f9f5b7780c2;hpb=eed7408e7e451a376b42e1183ec5d7b55c9c832d;p=openldap

diff --git a/libraries/libldap/getattr.c b/libraries/libldap/getattr.c
index 8e655da12e..1af9881381 100644
--- a/libraries/libldap/getattr.c
+++ b/libraries/libldap/getattr.c
@@ -12,7 +12,7 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/socket.h>
@@ -24,11 +24,16 @@
 char *
 ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **ber )
 {
-	long	len;
+	char *attr;
 
 	Debug( LDAP_DEBUG_TRACE, "ldap_first_attribute\n", 0, 0, 0 );
 
-	if ( (*ber = ldap_alloc_ber_with_options( ld )) == NULLBER ) {
+	assert( ld != NULL );
+	assert( LDAP_VALID( ld ) );
+	assert( entry != NULL );
+	assert( ber != NULL );
+
+	if ( (*ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
 		*ber = NULL;
 		return( NULL );
 	}
@@ -41,8 +46,7 @@ ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **ber )
 	 * positioned right before the next attribute type/value sequence.
 	 */
 
-	len = LDAP_MAX_ATTR_LEN;
-	if ( ber_scanf( *ber, "{x{{sx}", ld->ld_attrbuffer, &len )
+	if ( ber_scanf( *ber, "{x{{ax}" /*}}*/, &attr )
 	    == LBER_ERROR ) {
 		ld->ld_errno = LDAP_DECODING_ERROR;
 		ber_free( *ber, 0 );
@@ -50,25 +54,28 @@ ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **ber )
 		return( NULL );
 	}
 
-	return( ld->ld_attrbuffer );
+	return( attr );
 }
 
 /* ARGSUSED */
 char *
 ldap_next_attribute( LDAP *ld, LDAPMessage *entry, BerElement *ber )
 {
-	long	len;
+	char *attr;
 
 	Debug( LDAP_DEBUG_TRACE, "ldap_next_attribute\n", 0, 0, 0 );
 
+	assert( ld != NULL );
+	assert( LDAP_VALID( ld ) );
+	assert( entry != NULL );
+	assert( ber != NULL );
+
 	/* skip sequence, snarf attribute type, skip values */
-	len = LDAP_MAX_ATTR_LEN;
-	if ( ber_scanf( ber, "{sx}", ld->ld_attrbuffer, &len ) 
+	if ( ber_scanf( ber, "{ax}", &attr ) 
 	    == LBER_ERROR ) {
 		ld->ld_errno = LDAP_DECODING_ERROR;
-		/* ber_free( ber, 0 ); *//* don't free the BerElement */
 		return( NULL );
 	}
 
-	return( ld->ld_attrbuffer );
+	return( attr );
 }