--- libraries/liblber/decode.c	1999/01/19 23:53:05	1.5.2.4.2.1
+++ libraries/liblber/decode.c	1998/12/22 00:34:02	1.12
@@ -1,9 +1,5 @@
 /* decode.c - ber input decoding routines */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-/* Portions
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
  *
@@ -25,11 +21,7 @@
 #include <ac/string.h>
 #include <ac/socket.h>
 
-#include "lber.h"
-
-#ifdef LDAP_DEBUG
-int	lber_debug;
-#endif
+#include "lber-int.h"
 
 static int ber_getnint LDAP_P(( BerElement *ber, long *num, int len ));
 
@@ -228,19 +220,14 @@ ber_get_stringa( BerElement *ber, char *
 {
 	unsigned long	datalen, tag;
 
-	if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) {
-		*buf = NULL;
+	if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT )
 		return( LBER_DEFAULT );
-	}
 
 	if ( (*buf = (char *) malloc( (size_t)datalen + 1 )) == NULL )
 		return( LBER_DEFAULT );
 
-	if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen ) {
-		free( *buf );
-		*buf = NULL;
+	if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen )
 		return( LBER_DEFAULT );
-	}
 	(*buf)[datalen] = '\0';
 
 #ifdef STR_TRANSLATION
@@ -250,7 +237,6 @@ ber_get_stringa( BerElement *ber, char *
 		if ( (*(ber->ber_decode_translate_proc))( buf, &datalen, 1 )
 		    != 0 ) {
 			free( *buf );
-			*buf = NULL;
 			return( LBER_DEFAULT );
 		}
 	}
@@ -264,25 +250,17 @@ ber_get_stringal( BerElement *ber, struc
 {
 	unsigned long	len, tag;
 
-	if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) {
-		*bv = NULL;
+	if ( (*bv = (struct berval *) malloc( sizeof(struct berval) )) == NULL )
 		return( LBER_DEFAULT );
-	}
 
-	if ( (*bv = (struct berval *) malloc( sizeof(struct berval) )) == NULL )
+	if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT )
 		return( LBER_DEFAULT );
 
-	if ( ((*bv)->bv_val = (char *) malloc( (size_t)len + 1 )) == NULL ) {
-		free( *bv );
-		*bv = NULL;
+	if ( ((*bv)->bv_val = (char *) malloc( (size_t)len + 1 )) == NULL )
 		return( LBER_DEFAULT );
-	}
 
-	if ( (unsigned long) ber_read( ber, (*bv)->bv_val, len ) != len ) {
-		ber_bvfree( *bv );
-		*bv = NULL;
+	if ( (unsigned long) ber_read( ber, (*bv)->bv_val, len ) != len )
 		return( LBER_DEFAULT );
-	}
 	((*bv)->bv_val)[len] = '\0';
 	(*bv)->bv_len = len;
 
@@ -292,8 +270,7 @@ ber_get_stringal( BerElement *ber, struc
 		++len;
 		if ( (*(ber->ber_decode_translate_proc))( &((*bv)->bv_val),
 		    &len, 1 ) != 0 ) {
-			ber_bvfree( *bv );
-			*bv = NULL;
+			free( (*bv)->bv_val );
 			return( LBER_DEFAULT );
 		}
 		(*bv)->bv_len = len - 1;
@@ -309,26 +286,18 @@ ber_get_bitstringa( BerElement *ber, cha
 	unsigned long	datalen, tag;
 	unsigned char	unusedbits;
 
-	if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) {
-		*buf = NULL;
+	if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT )
 		return( LBER_DEFAULT );
-	}
 	--datalen;
 
 	if ( (*buf = (char *) malloc( (size_t)datalen )) == NULL )
 		return( LBER_DEFAULT );
 
-	if ( ber_read( ber, (char *)&unusedbits, 1 ) != 1 ) {
-		free( buf );
-		*buf = NULL;
+	if ( ber_read( ber, (char *)&unusedbits, 1 ) != 1 )
 		return( LBER_DEFAULT );
-	}
 
-	if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen ) {
-		free( buf );
-		*buf = NULL;
+	if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen )
 		return( LBER_DEFAULT );
-	}
 
 	*blen = datalen * 8 - unusedbits;
 	return( tag );
@@ -365,14 +334,17 @@ ber_first_element( BerElement *ber, unsi
 {
 	/* skip the sequence header, use the len to mark where to stop */
 	if ( ber_skip_tag( ber, len ) == LBER_DEFAULT ) {
-		*last = NULL;
 		return( LBER_DEFAULT );
 	}
 
 	*last = ber->ber_ptr + *len;
 
 	if ( *last == ber->ber_ptr ) {
+#ifdef LBER_END_SEQORSET 
+		return( LBER_END_SEQORSET );
+#else
 		return( LBER_DEFAULT );
+#endif
 	}
 
 	return( ber_peek_tag( ber, len ) );
@@ -382,7 +354,11 @@ unsigned long
 ber_next_element( BerElement *ber, unsigned long *len, char *last )
 {
 	if ( ber->ber_ptr == last ) {
+#ifdef LBER_END_SEQORSET 
+		return( LBER_END_SEQORSET );
+#else
 		return( LBER_DEFAULT );
+#endif
 	}
 
 	return( ber_peek_tag( ber, len ) );
@@ -403,7 +379,6 @@ va_dcl
 	BerElement	*ber;
 	char		*fmt;
 #endif
-	char		*fmt_reset;
 	char		*last;
 	char		*s, **ss, ***sss;
 	struct berval 	***bv, **bvp, *bval;
@@ -418,18 +393,14 @@ va_dcl
 	ber = va_arg( ap, BerElement * );
 	fmt = va_arg( ap, char * );
 #endif
-	fmt_reset = fmt;
 
-#ifdef LDAP_DEBUG
-	if ( lber_debug & 64 ) {
-		fprintf( stderr, "ber_scanf fmt (%s) ber:\n", fmt );
-		ber_dump( ber, 1 );
+	if ( ber->ber_debug ) {
+		lber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug,
+			"ber_scanf fmt (%s) ber:\n", fmt );
+		lber_log_dump( LDAP_DEBUG_BER, ber->ber_debug, ber, 1 );
 	}
-#endif
 
 	for ( rc = 0; *fmt && rc != LBER_DEFAULT; fmt++ ) {
-		/* When this is modified, remember to update
-		 * the error-cleanup code below accordingly. */
 		switch ( *fmt ) {
 		case 'a':	/* octet string - allocate storage as needed */
 			ss = va_arg( ap, char ** );
@@ -494,8 +465,13 @@ va_dcl
 			*sss = NULL;
 			j = 0;
 			for ( tag = ber_first_element( ber, &len, &last );
-			    tag != LBER_DEFAULT && rc != LBER_DEFAULT;
-			    tag = ber_next_element( ber, &len, last ) ) {
+			    tag != LBER_DEFAULT && 
+#ifdef LDAP_END_SEQORSET
+					tag != LBER_END_SEQORSET &&
+#endif
+					rc != LBER_DEFAULT;
+			    tag = ber_next_element( ber, &len, last ) )
+			{
 				if ( *sss == NULL ) {
 					*sss = (char **) malloc(
 					    2 * sizeof(char *) );
@@ -506,6 +482,13 @@ va_dcl
 				rc = ber_get_stringa( ber, &((*sss)[j]) );
 				j++;
 			}
+#ifdef LDAP_END_SEQORSET
+			if (rc != LBER_DEFAULT && 
+				tag != LBER_END_SEQORSET )
+			{
+				rc = LBER_DEFAULT;
+			}
+#endif
 			if ( j > 0 )
 				(*sss)[j] = NULL;
 			break;
@@ -515,8 +498,13 @@ va_dcl
 			*bv = NULL;
 			j = 0;
 			for ( tag = ber_first_element( ber, &len, &last );
-			    tag != LBER_DEFAULT && rc != LBER_DEFAULT;
-			    tag = ber_next_element( ber, &len, last ) ) {
+			    tag != LBER_DEFAULT && 
+#ifdef LDAP_END_SEQORSET
+					tag != LBER_END_SEQORSET &&
+#endif
+					rc != LBER_DEFAULT;
+			    tag = ber_next_element( ber, &len, last ) )
+			{
 				if ( *bv == NULL ) {
 					*bv = (struct berval **) malloc(
 					    2 * sizeof(struct berval *) );
@@ -527,6 +515,13 @@ va_dcl
 				rc = ber_get_stringal( ber, &((*bv)[j]) );
 				j++;
 			}
+#ifdef LDAP_END_SEQORSET
+			if (rc != LBER_DEFAULT && 
+				tag != LBER_END_SEQORSET )
+			{
+				rc = LBER_DEFAULT;
+			}
+#endif
 			if ( j > 0 )
 				(*bv)[j] = NULL;
 			break;
@@ -548,9 +543,10 @@ va_dcl
 			break;
 
 		default:
-#ifdef LDAP_LIBUI
-			fprintf( stderr, "unknown fmt %c\n", *fmt );
-#endif /* LDAP_LIBUI */
+			if( ber->ber_debug ) {
+				lber_log_printf( LDAP_DEBUG_ANY, ber->ber_debug,
+					"ber_scanf: unknown fmt %c\n", *fmt );
+			}
 			rc = LBER_DEFAULT;
 			break;
 		}
@@ -558,109 +554,15 @@ va_dcl
 
 	va_end( ap );
 
-	if ( rc == LBER_DEFAULT ) {
-	    /*
-	     * Error.  Reclaim malloced memory that was given to the caller.
-	     * Set allocated pointers to NULL, "data length" outvalues to 0.
-	     */
-#ifdef HAVE_STDARG
-	    va_start( ap, fmt );
-#else
-	    va_start( ap );
-	    (void) va_arg( ap, BerElement * );
-	    (void) va_arg( ap, char * );
-#endif
-
-	    for ( ; fmt_reset < fmt; fmt_reset++ ) {
-		switch ( *fmt_reset ) {
-		case 'a':	/* octet string - allocate storage as needed */
-			ss = va_arg( ap, char ** );
-			if ( *ss ) {
-				free( *ss );
-				*ss = NULL;
-			}
-			break;
-
-		case 'b':	/* boolean */
-		case 't':	/* tag of next item */
-		case 'T':	/* skip tag of next item */
-			(void) va_arg( ap, int * );
-			break;
-
-		case 's':	/* octet string - in a buffer */
-			(void) va_arg( ap, char * );
-			/* Fall through */
-		case 'e':	/* enumerated */
-		case 'i':	/* int */
-		case 'l':	/* length of next item */
-			(void) va_arg( ap, long * );
-			break;
-
-		case 'o':	/* octet string in a supplied berval */
-			bval = va_arg( ap, struct berval * );
-			if ( bval->bv_val ) {
-				free( bval->bv_val );
-				bval->bv_val = NULL;
-			}
-			bval->bv_len = 0;
-			break;
-
-		case 'O':	/* octet string - allocate & include length */
-			bvp = va_arg( ap, struct berval ** );
-			if ( *bvp ) {
-				ber_bvfree( *bvp );
-				*bvp = NULL;
-			}
-			break;
-
-		case 'B':	/* bit string - allocate storage as needed */
-			ss = va_arg( ap, char ** );
-			if ( *ss ) {
-				free( *ss );
-				*ss = NULL;
-			}
-			*(va_arg( ap, long * )) = 0; /* for length, in bits */
-			break;
-
-		case 'v':	/* sequence of strings */
-			sss = va_arg( ap, char *** );
-			if ( *sss ) {
-				for (j = 0;  (*sss)[j];  j++)
-					free( (*sss)[j] );
-				free( *sss );
-				*sss = NULL;
-			}
-			break;
-
-		case 'V':	/* sequence of strings + lengths */
-			bv = va_arg( ap, struct berval *** );
-			if ( *bv ) {
-				ber_bvecfree( *bv );
-				*bv = NULL;
-			}
-			break;
-
-#if 0		/* No action for these format characters */
-		case 'n':	/* null */
-		case 'x':	/* skip the next element - whatever it is */
-		case '{':	/* begin sequence */
-		case '[':	/* begin set */
-		case '}':	/* end sequence */
-		case ']':	/* end set */
-#endif
-
-		}
-	    }
-
-	    va_end( ap );
-	}
-
 	return( rc );
 }
 
 void
 ber_bvfree( struct berval *bv )
 {
+#ifdef LBER_ASSERT
+	assert(bv != NULL);			/* bv damn better point to something */
+#endif
 	if ( bv->bv_val != NULL )
 		free( bv->bv_val );
 	free( (char *) bv );
@@ -671,6 +573,9 @@ ber_bvecfree( struct berval **bv )
 {
 	int	i;
 
+#ifdef LBER_ASSERT
+	assert(bv != NULL);			/* bv damn better point to something */
+#endif
 	for ( i = 0; bv[i] != NULL; i++ )
 		ber_bvfree( bv[i] );
 	free( (char *) bv );
@@ -685,9 +590,18 @@ ber_bvdup( struct berval *bv )
 	    == NULL ) {
 		return( NULL );
 	}
+
+	if ( bv->bv_val == NULL ) {
+		new->bv_val = NULL;
+		new->bv_len = 0;
+		return ( new );
+	}
+
 	if ( (new->bv_val = (char *) malloc( bv->bv_len + 1 )) == NULL ) {
+		free( new );
 		return( NULL );
 	}
+
 	SAFEMEMCPY( new->bv_val, bv->bv_val, (size_t) bv->bv_len );
 	new->bv_val[bv->bv_len] = '\0';
 	new->bv_len = bv->bv_len;