X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fgetvalues.c;h=1ac26f447a59887da8a4097c35f07d4a7b947308;hb=613bf0b077ee2afdd254f073b876098519643c00;hp=724963a1a3b3f085aae95cb75abfdd9fd0818d91;hpb=4d2761a6a64eaa1c4d5f7949277ecfe25b42ca83;p=openldap

diff --git a/libraries/libldap/getvalues.c b/libraries/libldap/getvalues.c
index 724963a1a3..1ac26f447a 100644
--- a/libraries/libldap/getvalues.c
+++ b/libraries/libldap/getvalues.c
@@ -12,7 +12,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/socket.h>
@@ -22,21 +23,24 @@
 #include "ldap-int.h"
 
 char **
-ldap_get_values( LDAP *ld, LDAPMessage *entry, char *target )
+ldap_get_values( LDAP *ld, LDAPMessage *entry, LDAP_CONST char *target )
 {
 	BerElement	ber;
-	char		attr[LDAP_MAX_ATTR_LEN];
+	char		*attr;
 	int		found = 0;
-	long		len;
 	char		**vals;
 
+	assert( ld != NULL );
+	assert( LDAP_VALID( ld ) );
+	assert( entry != NULL );
+	assert( target != NULL );
+
 	Debug( LDAP_DEBUG_TRACE, "ldap_get_values\n", 0, 0, 0 );
 
 	ber = *entry->lm_ber;
 
 	/* skip sequence, dn, sequence of, and snag the first attr */
-	len = sizeof(attr);
-	if ( ber_scanf( &ber, "{x{{s", attr, &len ) == LBER_ERROR ) {
+	if ( ber_scanf( &ber, "{x{{a" /*}}}*/, &attr ) == LBER_ERROR ) {
 		ld->ld_errno = LDAP_DECODING_ERROR;
 		return( NULL );
 	}
@@ -46,16 +50,22 @@ ldap_get_values( LDAP *ld, LDAPMessage *entry, char *target )
 
 	/* break out on success, return out on error */
 	while ( ! found ) {
-		len = sizeof(attr);
-		if ( ber_scanf( &ber, "x}{s", attr, &len ) == LBER_ERROR ) {
+		LDAP_FREE(attr);
+		attr = NULL;
+
+		if ( ber_scanf( &ber, /*{*/ "x}{a" /*}*/, &attr ) == LBER_ERROR ) {
 			ld->ld_errno = LDAP_DECODING_ERROR;
 			return( NULL );
 		}
 
 		if ( strcasecmp( target, attr ) == 0 )
 			break;
+
 	}
 
+	LDAP_FREE(attr);
+	attr = NULL;
+
 	/* 
 	 * if we get this far, we've found the attribute and are sitting
 	 * just before the set of values.
@@ -70,21 +80,24 @@ ldap_get_values( LDAP *ld, LDAPMessage *entry, char *target )
 }
 
 struct berval **
-ldap_get_values_len( LDAP *ld, LDAPMessage *entry, char *target )
+ldap_get_values_len( LDAP *ld, LDAPMessage *entry, LDAP_CONST char *target )
 {
 	BerElement	ber;
-	char		attr[LDAP_MAX_ATTR_LEN];
+	char		*attr;
 	int		found = 0;
-	long		len;
 	struct berval	**vals;
 
+	assert( ld != NULL );
+	assert( LDAP_VALID( ld ) );
+	assert( entry != NULL );
+	assert( target != NULL );
+
 	Debug( LDAP_DEBUG_TRACE, "ldap_get_values_len\n", 0, 0, 0 );
 
 	ber = *entry->lm_ber;
 
 	/* skip sequence, dn, sequence of, and snag the first attr */
-	len = sizeof(attr);
-	if ( ber_scanf( &ber, "{x{{s", attr, &len ) == LBER_ERROR ) {
+	if ( ber_scanf( &ber, "{x{{a" /* }}} */, &attr ) == LBER_ERROR ) {
 		ld->ld_errno = LDAP_DECODING_ERROR;
 		return( NULL );
 	}
@@ -94,8 +107,10 @@ ldap_get_values_len( LDAP *ld, LDAPMessage *entry, char *target )
 
 	/* break out on success, return out on error */
 	while ( ! found ) {
-		len = sizeof(attr);
-		if ( ber_scanf( &ber, "x}{s", attr, &len ) == LBER_ERROR ) {
+		LDAP_FREE( attr );
+		attr = NULL;
+
+		if ( ber_scanf( &ber, /*{*/ "x}{a" /*}*/, &attr ) == LBER_ERROR ) {
 			ld->ld_errno = LDAP_DECODING_ERROR;
 			return( NULL );
 		}
@@ -104,6 +119,9 @@ ldap_get_values_len( LDAP *ld, LDAPMessage *entry, char *target )
 			break;
 	}
 
+	LDAP_FREE( attr );
+	attr = NULL;
+
 	/* 
 	 * if we get this far, we've found the attribute and are sitting
 	 * just before the set of values.
@@ -140,25 +158,11 @@ ldap_count_values_len( struct berval **vals )
 void
 ldap_value_free( char **vals )
 {
-	int	i;
-
-	if ( vals == NULL )
-		return;
-	for ( i = 0; vals[i] != NULL; i++ )
-		free( vals[i] );
-	free( (char *) vals );
+	LDAP_VFREE( vals );
 }
 
 void
 ldap_value_free_len( struct berval **vals )
 {
-	int	i;
-
-	if ( vals == NULL )
-		return;
-	for ( i = 0; vals[i] != NULL; i++ ) {
-		free( vals[i]->bv_val );
-		free( vals[i] );
-	}
-	free( (char *) vals );
+	ber_bvecfree( vals );
 }