--- libraries/liblber/decode.c	1998/12/22 00:34:02	1.12
+++ libraries/liblber/decode.c	2001/12/04 18:49:15	1.34.6.9
@@ -1,5 +1,10 @@
 /* decode.c - ber input decoding routines */
+/* $OpenLDAP: pkg/ldap/libraries/liblber/decode.c,v 1.34.6.8 2001/11/06 16:49:17 kurt Exp $ */
 /*
+ * Copyright 1998-2000 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.
  *
@@ -14,59 +19,73 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
 
-#include <ac/stdarg.h>
+#include <ac/stdlib.h>
 
+#include <ac/stdarg.h>
 #include <ac/string.h>
 #include <ac/socket.h>
 
 #include "lber-int.h"
 
-static int ber_getnint LDAP_P(( BerElement *ber, long *num, int len ));
+static ber_len_t ber_getnint LDAP_P((
+	BerElement *ber,
+	ber_int_t *num,
+	ber_len_t len ));
 
 /* return the tag - LBER_DEFAULT returned means trouble */
-unsigned long
+ber_tag_t
 ber_get_tag( BerElement *ber )
 {
 	unsigned char	xbyte;
-	unsigned long	tag;
-	char		*tagp;
+	ber_tag_t	tag;
 	unsigned int	i;
 
-	if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 )
-		return( LBER_DEFAULT );
+	assert( ber != NULL );
+	assert( BER_VALID( ber ) );
 
-	if ( (xbyte & LBER_BIG_TAG_MASK) != LBER_BIG_TAG_MASK )
-		return( (unsigned long) xbyte );
+	if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 ) {
+		return LBER_DEFAULT;
+	}
 
-	tagp = (char *) &tag;
-	tagp[0] = xbyte;
-	for ( i = 1; i < sizeof(long); i++ ) {
-		if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 )
-			return( LBER_DEFAULT );
+	tag = xbyte;
 
-		tagp[i] = xbyte;
+	if ( (xbyte & LBER_BIG_TAG_MASK) != LBER_BIG_TAG_MASK ) {
+		return tag;
+	}
 
-		if ( ! (xbyte & LBER_MORE_TAG_MASK) )
+	for ( i = 1; i < sizeof(ber_tag_t); i++ ) {
+		if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 ) {
+			return LBER_DEFAULT;
+		}
+
+		tag <<= 8;
+		tag |= 0x00ffUL & (ber_tag_t) xbyte;
+
+		if ( ! (xbyte & LBER_MORE_TAG_MASK) ) {
 			break;
+		}
 	}
 
 	/* tag too big! */
-	if ( i == sizeof(long) )
-		return( LBER_DEFAULT );
+	if ( i == sizeof(ber_tag_t) ) {
+		return LBER_DEFAULT;
+	}
 
-	/* want leading, not trailing 0's */
-	return( tag >> (sizeof(long) - i - 1) );
+	return tag;
 }
 
-unsigned long
-ber_skip_tag( BerElement *ber, unsigned long *len )
+ber_tag_t
+ber_skip_tag( BerElement *ber, ber_len_t *len )
 {
-	unsigned long	tag;
+	ber_tag_t	tag;
 	unsigned char	lc;
-	int		noctets, diff;
-	unsigned long	netlen;
+	ber_len_t	i, noctets;
+	unsigned char netlen[sizeof(ber_len_t)];
+
+	assert( ber != NULL );
+	assert( len != NULL );
+	assert( BER_VALID( ber ) );
 
 	/*
 	 * Any ber element looks like this: tag length contents.
@@ -78,58 +97,85 @@ ber_skip_tag( BerElement *ber, unsigned
 	 *	2) primitive encodings used whenever possible
 	 */
 
+	*len = 0;
+
 	/*
 	 * First, we read the tag.
 	 */
 
-	if ( (tag = ber_get_tag( ber )) == LBER_DEFAULT )
-		return( LBER_DEFAULT );
+	if ( (tag = ber_get_tag( ber )) == LBER_DEFAULT ) {
+		return LBER_DEFAULT;
+	}
 
 	/*
 	 * Next, read the length.  The first byte contains the length of
 	 * the length.  If bit 8 is set, the length is the long form,
 	 * otherwise it's the short form.  We don't allow a length that's
-	 * greater than what we can hold in an unsigned long.
+	 * greater than what we can hold in a ber_len_t.
 	 */
 
-	*len = netlen = 0;
 	if ( ber_read( ber, (char *) &lc, 1 ) != 1 )
-		return( LBER_DEFAULT );
-	if ( lc & 0x80 ) {
-		noctets = (lc & 0x7f);
-		if ( noctets > sizeof(unsigned long) )
-			return( LBER_DEFAULT );
-		diff = sizeof(unsigned long) - noctets;
-		if ( ber_read( ber, (char *) &netlen + diff, noctets )
-		    != noctets )
-			return( LBER_DEFAULT );
-		*len = AC_NTOHL( netlen );
+		return LBER_DEFAULT;
+
+	if ( lc & 0x80U ) {
+		noctets = (lc & 0x7fU);
+
+		if ( noctets > sizeof(ber_len_t) ) {
+			return LBER_DEFAULT;
+		}
+
+		if( (unsigned) ber_read( ber, netlen, noctets ) != noctets ) {
+			return LBER_DEFAULT;
+		}
+
+		for( i = 0; i < noctets; i++ ) {
+			*len <<= 8;
+			*len |= netlen[i];
+		}
+
 	} else {
 		*len = lc;
 	}
 
-	return( tag );
+	/* BER element should have enough data left */
+	if( *len > ber_pvt_ber_remaining( ber ) ) {
+		return LBER_DEFAULT;
+	}
+
+	return tag;
 }
 
-unsigned long
-ber_peek_tag( BerElement *ber, unsigned long *len )
+ber_tag_t
+ber_peek_tag(
+	BerElement *ber,
+	ber_len_t *len )
 {
-	char		*save;
-	unsigned long	tag;
+	/*
+	 * This implementation assumes ber_skip_tag() only
+	 * modifies ber_ptr field of the BerElement.
+	 */
+
+	char *save;
+	ber_tag_t	tag;
 
 	save = ber->ber_ptr;
 	tag = ber_skip_tag( ber, len );
 	ber->ber_ptr = save;
 
-	return( tag );
+	return tag;
 }
 
-static int
-ber_getnint( BerElement *ber, long *num, int len )
+static ber_len_t
+ber_getnint(
+	BerElement *ber,
+	ber_int_t *num,
+	ber_len_t len )
 {
-	int	diff, sign, i;
-	long	netnum;
-	char    *p;
+	unsigned char buf[sizeof(ber_int_t)];
+
+	assert( ber != NULL );
+	assert( num != NULL );
+	assert( BER_VALID( ber ) );
 
 	/*
 	 * The tag and length have already been stripped off.  We should
@@ -138,289 +184,360 @@ ber_getnint( BerElement *ber, long *num,
 	 * extend after we read it in.
 	 */
 
-	if ( len > sizeof(long) )
-		return( -1 );
+	if ( len > sizeof(ber_int_t) ) {
+		return -1;
+	}
+
+	/* read into the low-order bytes of our buffer */
+	if ( (ber_len_t) ber_read( ber, (char *) buf, len ) != len ) {
+		return -1;
+	}
+
+	if( len ) {
+		/* sign extend if necessary */
+		ber_len_t i;
+		ber_int_t netnum = 0x80 & buf[0] ? -1 : 0;
 
-	netnum = 0;
-	diff = sizeof(long) - len;
-	/* read into the low-order bytes of netnum */
-	if ( ber_read( ber, ((char *) &netnum) + diff, len ) != len )
-		return( -1 );
-
-        /* sign extend if necessary */
-        p = (char *) &netnum;
-        sign = (0x80 & *(p+diff) );
-        if ( sign && len < sizeof(long) ) {
-                for ( i = 0; i < diff; i++ ) {
-                        *(p+i) = (unsigned char) 0xff;
+		/* shift in the bytes */
+		for( i=0 ; i<len; i++ ) {
+			netnum = (netnum << 8 ) | buf[i];
 		}
+
+		*num = netnum;
+
+	} else {
+		*num = 0;
 	}
-	*num = AC_NTOHL( netnum );
 
-	return( len );
+	return len;
 }
 
-unsigned long
-ber_get_int( BerElement *ber, long *num )
+ber_tag_t
+ber_get_int(
+	BerElement *ber,
+	ber_int_t *num )
 {
-	unsigned long	tag, len;
+	ber_tag_t	tag;
+	ber_len_t	len;
 
-	if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT )
-		return( LBER_DEFAULT );
+	assert( ber != NULL );
+	assert( BER_VALID( ber ) );
 
-	if ( (unsigned long) ber_getnint( ber, num, (int)len ) != len )
-		return( LBER_DEFAULT );
-	else
-		return( tag );
+	if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) {
+		return LBER_DEFAULT;
+	}
+
+	if ( ber_getnint( ber, num, len ) != len ) {
+		return LBER_DEFAULT;
+	}
+	
+	return tag;
 }
 
-unsigned long
-ber_get_stringb( BerElement *ber, char *buf, unsigned long *len )
+ber_tag_t
+ber_get_enum(
+	BerElement *ber,
+	ber_int_t *num )
 {
-	unsigned long	datalen, tag;
-#ifdef STR_TRANSLATION
-	char		*transbuf;
-#endif /* STR_TRANSLATION */
+	return ber_get_int( ber, num );
+}
 
-	if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT )
-		return( LBER_DEFAULT );
-	if ( datalen > (*len - 1) )
-		return( LBER_DEFAULT );
+ber_tag_t
+ber_get_stringb(
+	BerElement *ber,
+	char *buf,
+	ber_len_t *len )
+{
+	ber_len_t	datalen;
+	ber_tag_t	tag;
 
-	if ( (unsigned long) ber_read( ber, buf, datalen ) != datalen )
-		return( LBER_DEFAULT );
+	assert( ber != NULL );
+	assert( BER_VALID( ber ) );
 
-	buf[datalen] = '\0';
+	if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) {
+		return LBER_DEFAULT;
+	}
 
-#ifdef STR_TRANSLATION
-	if ( datalen > 0 && ( ber->ber_options & LBER_TRANSLATE_STRINGS ) != 0
-	    && ber->ber_decode_translate_proc != NULL ) {
-		transbuf = buf;
-		++datalen;
-		if ( (*(ber->ber_decode_translate_proc))( &transbuf, &datalen,
-		    0 ) != 0 ) {
-			return( LBER_DEFAULT );
-		}
-		if ( datalen > *len ) {
-			free( transbuf );
-			return( LBER_DEFAULT );
-		}
-		SAFEMEMCPY( buf, transbuf, datalen );
-		free( transbuf );
-		--datalen;
+	/* must fit within allocated space with termination */
+	if ( datalen >= *len ) {
+		return LBER_DEFAULT;
+	}
+
+	if ( (ber_len_t) ber_read( ber, buf, datalen ) != datalen ) {
+		return LBER_DEFAULT;
 	}
-#endif /* STR_TRANSLATION */
+
+	buf[datalen] = '\0';
 
 	*len = datalen;
-	return( tag );
+	return tag;
 }
 
-unsigned long
+ber_tag_t
 ber_get_stringa( BerElement *ber, char **buf )
 {
-	unsigned long	datalen, tag;
+	ber_len_t	datalen;
+	ber_tag_t	tag;
 
-	if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT )
-		return( LBER_DEFAULT );
+	assert( ber != NULL );
+	assert( buf != NULL );
 
-	if ( (*buf = (char *) malloc( (size_t)datalen + 1 )) == NULL )
-		return( LBER_DEFAULT );
+	assert( BER_VALID( ber ) );
 
-	if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen )
-		return( LBER_DEFAULT );
-	(*buf)[datalen] = '\0';
+	if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) {
+		*buf = NULL;
+		return LBER_DEFAULT;
+	}
 
-#ifdef STR_TRANSLATION
-	if ( datalen > 0 && ( ber->ber_options & LBER_TRANSLATE_STRINGS ) != 0
-	    && ber->ber_decode_translate_proc != NULL ) {
-		++datalen;
-		if ( (*(ber->ber_decode_translate_proc))( buf, &datalen, 1 )
-		    != 0 ) {
-			free( *buf );
-			return( LBER_DEFAULT );
-		}
+	if ( (*buf = (char *) LBER_MALLOC( datalen + 1 )) == NULL ) {
+		return LBER_DEFAULT;
 	}
-#endif /* STR_TRANSLATION */
 
-	return( tag );
+	if ( (ber_len_t) ber_read( ber, *buf, datalen ) != datalen ) {
+		LBER_FREE( *buf );
+		*buf = NULL;
+		return LBER_DEFAULT;
+	}
+	(*buf)[datalen] = '\0';
+
+	return tag;
 }
 
-unsigned long
+ber_tag_t
 ber_get_stringal( BerElement *ber, struct berval **bv )
 {
-	unsigned long	len, tag;
+	ber_len_t	len;
+	ber_tag_t	tag;
 
-	if ( (*bv = (struct berval *) malloc( sizeof(struct berval) )) == NULL )
-		return( LBER_DEFAULT );
+	assert( ber != NULL );
+	assert( bv != NULL );
 
-	if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT )
-		return( LBER_DEFAULT );
+	assert( BER_VALID( ber ) );
 
-	if ( ((*bv)->bv_val = (char *) malloc( (size_t)len + 1 )) == NULL )
-		return( LBER_DEFAULT );
+	if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) {
+		*bv = NULL;
+		return LBER_DEFAULT;
+	}
 
-	if ( (unsigned long) ber_read( ber, (*bv)->bv_val, len ) != len )
-		return( LBER_DEFAULT );
-	((*bv)->bv_val)[len] = '\0';
-	(*bv)->bv_len = len;
+	*bv = (struct berval *) LBER_MALLOC( sizeof(struct berval) );
+	if ( *bv == NULL ) {
+		return LBER_DEFAULT;
+	}
 
-#ifdef STR_TRANSLATION
-	if ( len > 0 && ( ber->ber_options & LBER_TRANSLATE_STRINGS ) != 0
-	    && ber->ber_decode_translate_proc != NULL ) {
-		++len;
-		if ( (*(ber->ber_decode_translate_proc))( &((*bv)->bv_val),
-		    &len, 1 ) != 0 ) {
-			free( (*bv)->bv_val );
-			return( LBER_DEFAULT );
-		}
-		(*bv)->bv_len = len - 1;
+	if( len == 0 ) {
+		(*bv)->bv_val = NULL;
+		(*bv)->bv_len = 0;
+		return tag;
 	}
-#endif /* STR_TRANSLATION */
 
-	return( tag );
+	(*bv)->bv_val = (char *) LBER_MALLOC( len + 1 );
+	if ( (*bv)->bv_val == NULL ) {
+		LBER_FREE( *bv );
+		*bv = NULL;
+		return LBER_DEFAULT;
+	}
+
+	if ( (ber_len_t) ber_read( ber, (*bv)->bv_val, len ) != len ) {
+		ber_bvfree( *bv );
+		*bv = NULL;
+		return LBER_DEFAULT;
+	}
+
+	((*bv)->bv_val)[len] = '\0';
+	(*bv)->bv_len = len;
+
+	return tag;
 }
 
-unsigned long
-ber_get_bitstringa( BerElement *ber, char **buf, unsigned long *blen )
+ber_tag_t
+ber_get_bitstringa(
+	BerElement *ber,
+	char **buf,
+	ber_len_t *blen )
 {
-	unsigned long	datalen, tag;
+	ber_len_t	datalen;
+	ber_tag_t	tag;
 	unsigned char	unusedbits;
 
-	if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT )
-		return( LBER_DEFAULT );
+	assert( ber != NULL );
+	assert( buf != NULL );
+	assert( blen != NULL );
+
+	assert( BER_VALID( ber ) );
+
+	if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) {
+		*buf = NULL;
+		return LBER_DEFAULT;
+	}
 	--datalen;
 
-	if ( (*buf = (char *) malloc( (size_t)datalen )) == NULL )
-		return( LBER_DEFAULT );
+	if ( (*buf = (char *) LBER_MALLOC( datalen )) == NULL ) {
+		return LBER_DEFAULT;
+	}
 
-	if ( ber_read( ber, (char *)&unusedbits, 1 ) != 1 )
-		return( LBER_DEFAULT );
+	if ( ber_read( ber, (char *)&unusedbits, 1 ) != 1 ) {
+		LBER_FREE( buf );
+		*buf = NULL;
+		return LBER_DEFAULT;
+	}
 
-	if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen )
-		return( LBER_DEFAULT );
+	if ( (ber_len_t) ber_read( ber, *buf, datalen ) != datalen ) {
+		LBER_FREE( buf );
+		*buf = NULL;
+		return LBER_DEFAULT;
+	}
 
 	*blen = datalen * 8 - unusedbits;
-	return( tag );
+	return tag;
 }
 
-unsigned long
+ber_tag_t
 ber_get_null( BerElement *ber )
 {
-	unsigned long	len, tag;
+	ber_len_t	len;
+	ber_tag_t	tag;
+
+	assert( ber != NULL );
+	assert( BER_VALID( ber ) );
 
-	if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT )
-		return( LBER_DEFAULT );
+	if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) {
+		return LBER_DEFAULT;
+	}
 
-	if ( len != 0 )
-		return( LBER_DEFAULT );
+	if ( len != 0 ) {
+		return LBER_DEFAULT;
+	}
 
 	return( tag );
 }
 
-unsigned long
-ber_get_boolean( BerElement *ber, int *boolval )
+ber_tag_t
+ber_get_boolean(
+	BerElement *ber,
+	ber_int_t *boolval )
 {
-	long	longbool;
-	int	rc;
+	ber_int_t	longbool;
+	ber_tag_t	rc;
+
+	assert( ber != NULL );
+	assert( boolval != NULL );
+
+	assert( BER_VALID( ber ) );
 
 	rc = ber_get_int( ber, &longbool );
 	*boolval = longbool;
 
-	return( rc );
+	return rc;
 }
 
-unsigned long
-ber_first_element( BerElement *ber, unsigned long *len, char **last )
-{
+ber_tag_t
+ber_first_element(
+	BerElement *ber,
+	ber_len_t *len,
+	char **last )
+{
+	assert( ber != NULL );
+	assert( len != NULL );
+	assert( last != NULL );
+
 	/* skip the sequence header, use the len to mark where to stop */
 	if ( ber_skip_tag( ber, len ) == LBER_DEFAULT ) {
-		return( 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 LBER_DEFAULT;
 	}
 
-	return( ber_peek_tag( ber, len ) );
+	return ber_peek_tag( ber, len );
 }
 
-unsigned long
-ber_next_element( BerElement *ber, unsigned long *len, char *last )
+ber_tag_t
+ber_next_element(
+	BerElement *ber,
+	ber_len_t *len,
+	LDAP_CONST char *last )
 {
+	assert( ber != NULL );
+	assert( len != NULL );
+	assert( last != NULL );
+
+	assert( BER_VALID( ber ) );
+
 	if ( ber->ber_ptr == last ) {
-#ifdef LBER_END_SEQORSET 
-		return( LBER_END_SEQORSET );
-#else
-		return( LBER_DEFAULT );
-#endif
+		return LBER_DEFAULT;
 	}
 
-	return( ber_peek_tag( ber, len ) );
+	return ber_peek_tag( ber, len );
 }
 
 /* VARARGS */
-unsigned long
-ber_scanf
-#if HAVE_STDARG
-	( BerElement *ber, char *fmt, ... )
-#else
-	( va_alist )
-va_dcl
-#endif
+ber_tag_t
+ber_scanf ( BerElement *ber,
+	LDAP_CONST char *fmt,
+	... )
 {
 	va_list		ap;
-#ifndef HAVE_STDARG
-	BerElement	*ber;
-	char		*fmt;
-#endif
+	LDAP_CONST char		*fmt_reset;
 	char		*last;
 	char		*s, **ss, ***sss;
 	struct berval 	***bv, **bvp, *bval;
-	int		*i, j;
-	long		*l;
-	unsigned long	rc, tag, len;
+	ber_int_t	*i;
+	int j;
+	ber_len_t	*l;
+	ber_tag_t	*t;
+	ber_tag_t	rc, tag;
+	ber_len_t	len;
 
-#ifdef HAVE_STDARG
 	va_start( ap, fmt );
-#else
-	va_start( ap );
-	ber = va_arg( ap, BerElement * );
-	fmt = va_arg( ap, char * );
-#endif
-
-	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 );
-	}
+
+	assert( ber != NULL );
+	assert( fmt != NULL );
+
+	assert( BER_VALID( ber ) );
+
+	fmt_reset = fmt;
+
+	ber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug,
+		"ber_scanf fmt (%s) ber:\n", fmt );
+	ber_log_dump( LDAP_DEBUG_BER, ber->ber_debug, ber, 1 );
 
 	for ( rc = 0; *fmt && rc != LBER_DEFAULT; fmt++ ) {
+		/* When this is modified, remember to update
+		 * the error-cleanup code below accordingly. */
 		switch ( *fmt ) {
+		case '!': { /* Hook */
+				BERDecodeCallback *f;
+				void *p;
+
+				f = va_arg( ap, BERDecodeCallback * );
+				p = va_arg( ap, void * );
+
+				rc = (*f)( ber, p, 0 );
+			} break;
+
 		case 'a':	/* octet string - allocate storage as needed */
 			ss = va_arg( ap, char ** );
 			rc = ber_get_stringa( ber, ss );
 			break;
 
 		case 'b':	/* boolean */
-			i = va_arg( ap, int * );
+			i = va_arg( ap, ber_int_t * );
 			rc = ber_get_boolean( ber, i );
 			break;
 
 		case 'e':	/* enumerated */
 		case 'i':	/* int */
-			l = va_arg( ap, long * );
-			rc = ber_get_int( ber, l );
+			i = va_arg( ap, ber_int_t * );
+			rc = ber_get_int( ber, i );
 			break;
 
 		case 'l':	/* length of next item */
-			l = va_arg( ap, long * );
-			rc = ber_peek_tag( ber, (unsigned long *)l );
+			l = va_arg( ap, ber_len_t * );
+			rc = ber_peek_tag( ber, l );
 			break;
 
 		case 'n':	/* null */
@@ -429,8 +546,8 @@ va_dcl
 
 		case 's':	/* octet string - in a buffer */
 			s = va_arg( ap, char * );
-			l = va_arg( ap, long * );
-			rc = ber_get_stringb( ber, s, (unsigned long *)l );
+			l = va_arg( ap, ber_len_t * );
+			rc = ber_get_stringb( ber, s, l );
 			break;
 
 		case 'o':	/* octet string in a supplied berval */
@@ -446,18 +563,18 @@ va_dcl
 
 		case 'B':	/* bit string - allocate storage as needed */
 			ss = va_arg( ap, char ** );
-			l = va_arg( ap, long * ); /* for length, in bits */
-			rc = ber_get_bitstringa( ber, ss, (unsigned long *)l );
+			l = va_arg( ap, ber_len_t * ); /* for length, in bits */
+			rc = ber_get_bitstringa( ber, ss, l );
 			break;
 
 		case 't':	/* tag of next item */
-			i = va_arg( ap, int * );
-			*i = rc = ber_peek_tag( ber, &len );
+			t = va_arg( ap, ber_tag_t * );
+			*t = rc = ber_peek_tag( ber, &len );
 			break;
 
 		case 'T':	/* skip tag of next item */
-			i = va_arg( ap, int * );
-			*i = rc = ber_skip_tag( ber, &len );
+			t = va_arg( ap, ber_tag_t * );
+			*t = rc = ber_skip_tag( ber, &len );
 			break;
 
 		case 'v':	/* sequence of strings */
@@ -465,32 +582,25 @@ va_dcl
 			*sss = NULL;
 			j = 0;
 			for ( tag = ber_first_element( ber, &len, &last );
-			    tag != LBER_DEFAULT && 
-#ifdef LDAP_END_SEQORSET
-					tag != LBER_END_SEQORSET &&
-#endif
-					rc != LBER_DEFAULT;
+			    tag != LBER_DEFAULT && rc != LBER_DEFAULT;
 			    tag = ber_next_element( ber, &len, last ) )
 			{
-				if ( *sss == NULL ) {
-					*sss = (char **) malloc(
-					    2 * sizeof(char *) );
-				} else {
-					*sss = (char **) realloc( *sss,
-					    (j + 2) * sizeof(char *) );
+				char **save = *sss;
+
+				*sss = (char **) LBER_REALLOC( *sss,
+					(j + 2) * sizeof(char *) );
+
+				if( *sss == NULL ) {
+					save[j] = NULL;
+					ber_memvfree( (void **) save );
+					rc = LBER_DEFAULT;
+					goto breakout;
 				}
+
 				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;
+			if ( j > 0 ) (*sss)[j] = NULL;
 			break;
 
 		case 'V':	/* sequence of strings + lengths */
@@ -498,32 +608,25 @@ va_dcl
 			*bv = NULL;
 			j = 0;
 			for ( tag = ber_first_element( ber, &len, &last );
-			    tag != LBER_DEFAULT && 
-#ifdef LDAP_END_SEQORSET
-					tag != LBER_END_SEQORSET &&
-#endif
-					rc != LBER_DEFAULT;
+			    tag != LBER_DEFAULT && rc != LBER_DEFAULT;
 			    tag = ber_next_element( ber, &len, last ) )
 			{
-				if ( *bv == NULL ) {
-					*bv = (struct berval **) malloc(
-					    2 * sizeof(struct berval *) );
-				} else {
-					*bv = (struct berval **) realloc( *bv,
-					    (j + 2) * sizeof(struct berval *) );
+				struct berval **save = *bv;
+
+				*bv = (struct berval **) LBER_REALLOC( *bv,
+					(j + 2) * sizeof(struct berval *) );
+		
+				if( *bv == NULL ) {
+					save[j] = NULL;
+					ber_bvecfree( save );
+					rc = LBER_DEFAULT;
+					goto breakout;
 				}
+
 				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;
+			if ( j > 0 ) (*bv)[j] = NULL;
 			break;
 
 		case 'x':	/* skip the next element - whatever it is */
@@ -544,7 +647,7 @@ va_dcl
 
 		default:
 			if( ber->ber_debug ) {
-				lber_log_printf( LDAP_DEBUG_ANY, ber->ber_debug,
+				ber_log_printf( LDAP_DEBUG_ANY, ber->ber_debug,
 					"ber_scanf: unknown fmt %c\n", *fmt );
 			}
 			rc = LBER_DEFAULT;
@@ -552,70 +655,114 @@ va_dcl
 		}
 	}
 
+breakout:
 	va_end( ap );
 
-	return( rc );
-}
+	if ( rc == LBER_DEFAULT ) {
+	    /*
+	     * Error.  Reclaim malloced memory that was given to the caller.
+	     * Set allocated pointers to NULL, "data length" outvalues to 0.
+	     */
+	    va_start( ap, fmt );
+
+	    for ( ; fmt_reset < fmt; fmt_reset++ ) {
+		switch ( *fmt_reset ) {
+		case '!': { /* Hook */
+				BERDecodeCallback *f;
+				void *p;
 
-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 );
-}
+				f = va_arg( ap, BERDecodeCallback * );
+				p = va_arg( ap, void * );
 
-void
-ber_bvecfree( struct berval **bv )
-{
-	int	i;
+				(void) (*f)( ber, p, 1 );
+			} break;
 
-#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 );
-}
+		case 'a':	/* octet string - allocate storage as needed */
+			ss = va_arg( ap, char ** );
+			if ( *ss ) {
+				LBER_FREE( *ss );
+				*ss = NULL;
+			}
+			break;
 
-struct berval *
-ber_bvdup( struct berval *bv )
-{
-	struct berval	*new;
+		case 'b':	/* boolean */
+		case 'e':	/* enumerated */
+		case 'i':	/* int */
+			(void) va_arg( ap, int * );
+			break;
 
-	if ( (new = (struct berval *) malloc( sizeof(struct berval) ))
-	    == NULL ) {
-		return( NULL );
-	}
+		case 's':	/* octet string - in a buffer */
+			(void) va_arg( ap, char * );
+			(void) va_arg( ap, ber_len_t * );
+			break;
 
-	if ( bv->bv_val == NULL ) {
-		new->bv_val = NULL;
-		new->bv_len = 0;
-		return ( new );
-	}
+		case 'l':	/* length of next item */
+			(void) va_arg( ap, ber_len_t * );
+			break;
 
-	if ( (new->bv_val = (char *) malloc( bv->bv_len + 1 )) == NULL ) {
-		free( new );
-		return( NULL );
-	}
+		case 't':	/* tag of next item */
+		case 'T':	/* skip tag of next item */
+			(void) va_arg( ap, ber_tag_t * );
+			break;
 
-	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;
+		case 'o':	/* octet string in a supplied berval */
+			bval = va_arg( ap, struct berval * );
+			if ( bval->bv_val != NULL ) {
+				LBER_FREE( bval->bv_val );
+				bval->bv_val = NULL;
+			}
+			bval->bv_len = 0;
+			break;
 
-	return( new );
-}
+		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 ) {
+				LBER_FREE( *ss );
+				*ss = NULL;
+			}
+			*(va_arg( ap, ber_len_t * )) = 0; /* for length, in bits */
+			break;
 
-#ifdef STR_TRANSLATION
-void
-ber_set_string_translators( BerElement *ber, BERTranslateProc encode_proc,
-	BERTranslateProc decode_proc )
-{
-    ber->ber_encode_translate_proc = encode_proc;
-    ber->ber_decode_translate_proc = decode_proc;
+		case 'v':	/* sequence of strings */
+			sss = va_arg( ap, char *** );
+			if ( *sss ) {
+				ber_memvfree( (void **) *sss );
+				*sss = NULL;
+			}
+			break;
+
+		case 'V':	/* sequence of strings + lengths */
+			bv = va_arg( ap, struct berval *** );
+			if ( *bv ) {
+				ber_bvecfree( *bv );
+				*bv = NULL;
+			}
+			break;
+
+		case 'n':	/* null */
+		case 'x':	/* skip the next element - whatever it is */
+		case '{':	/* begin sequence */
+		case '[':	/* begin set */
+		case '}':	/* end sequence */
+		case ']':	/* end set */
+			break;
+
+		default:
+			/* format should be good */
+			assert( 0 );
+		}
+	    }
+
+	    va_end( ap );
+	}
+
+	return rc;
 }
-#endif /* STR_TRANSLATION */