--- libraries/liblber/decode.c	1998/11/06 00:48:50	1.5.2.2
+++ libraries/liblber/decode.c	1998/12/22 00:34:02	1.12
@@ -14,21 +14,14 @@
 #include "portable.h"
 
 #include <stdio.h>
-
-#ifdef STDC_HEADERS
 #include <stdlib.h>
-#endif
 
 #include <ac/stdarg.h>
 
 #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 ));
 
@@ -347,7 +340,11 @@ ber_first_element( BerElement *ber, unsi
 	*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 ) );
@@ -357,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 ) );
@@ -393,12 +394,11 @@ va_dcl
 	fmt = va_arg( ap, char * );
 #endif
 
-#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++ ) {
 		switch ( *fmt ) {
@@ -465,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 *) );
@@ -477,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;
@@ -486,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 *) );
@@ -498,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;
@@ -519,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;
 		}
@@ -535,6 +560,9 @@ va_dcl
 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 );
@@ -545,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 );
@@ -559,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;