X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Fliblber%2Fdecode.c;h=3ff84d34b80dbd39fa4f5297ddaee264d7b0c842;hb=5ee5709993bf60406a01fb1fc23ce3334d60d119;hp=1504e04a1aaf45093259d60bd27ff9363454b959;hpb=829b49b5c69243d1fe05039a032cfccb650e364f;p=openldap

diff --git a/libraries/liblber/decode.c b/libraries/liblber/decode.c
index 1504e04a1a..3ff84d34b8 100644
--- a/libraries/liblber/decode.c
+++ b/libraries/liblber/decode.c
@@ -1,11 +1,19 @@
 /* decode.c - ber input decoding routines */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2006 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
-/* Portions
- * Copyright (c) 1990 Regents of the University of Michigan.
+/* Portions Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -15,6 +23,10 @@
  * software without specific prior written permission. This software
  * is provided ``as is'' without express or implied warranty.
  */
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
+ * (as part of U-MICH LDAP).
+ */
 
 #include "portable.h"
 
@@ -44,13 +56,18 @@ ber_get_tag( BerElement *ber )
 	assert( ber != NULL );
 	assert( LBER_VALID( ber ) );
 
-	if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 ) {
+	if ( ber_pvt_ber_remaining( ber ) < 1 ) {
 		return LBER_DEFAULT;
 	}
 
-	tag = xbyte;
+	if ( ber->ber_ptr == ber->ber_buf ) {
+		tag = *(unsigned char *)ber->ber_ptr;
+	} else {
+		tag = ber->ber_tag;
+	}
+	ber->ber_ptr++;
 
-	if ( (xbyte & LBER_BIG_TAG_MASK) != LBER_BIG_TAG_MASK ) {
+	if ( (tag & LBER_BIG_TAG_MASK) != LBER_BIG_TAG_MASK ) {
 		return tag;
 	}
 
@@ -114,8 +131,9 @@ ber_skip_tag( BerElement *ber, ber_len_t *len )
 	 * greater than what we can hold in a ber_len_t.
 	 */
 
-	if ( ber_read( ber, (char *) &lc, 1 ) != 1 )
+	if ( ber_read( ber, (char *) &lc, 1 ) != 1 ) {
 		return LBER_DEFAULT;
+	}
 
 	if ( lc & 0x80U ) {
 		noctets = (lc & 0x7fU);
@@ -124,7 +142,7 @@ ber_skip_tag( BerElement *ber, ber_len_t *len )
 			return LBER_DEFAULT;
 		}
 
-		if( (unsigned) ber_read( ber, netlen, noctets ) != noctets ) {
+		if( (unsigned) ber_read( ber, (char *) netlen, noctets ) != noctets ) {
 			return LBER_DEFAULT;
 		}
 
@@ -137,15 +155,11 @@ ber_skip_tag( BerElement *ber, ber_len_t *len )
 		*len = lc;
 	}
 
-	/* BER length should be non-negative */
-	if( *len < 0 ) {
-		return LBER_DEFAULT;
-	}
-
 	/* BER element should have enough data left */
 	if( *len > (ber_len_t) ber_pvt_ber_remaining( ber ) ) {
 		return LBER_DEFAULT;
 	}
+	ber->ber_tag = *(unsigned char *)ber->ber_ptr;
 
 	return tag;
 }
@@ -161,11 +175,13 @@ ber_peek_tag(
 	 */
 
 	char *save;
-	ber_tag_t	tag;
+	ber_tag_t	tag, old;
 
+	old = ber->ber_tag;
 	save = ber->ber_ptr;
 	tag = ber_skip_tag( ber, len );
 	ber->ber_ptr = save;
+	ber->ber_tag = old;
 
 	return tag;
 }
@@ -213,6 +229,7 @@ ber_getnint(
 	} else {
 		*num = 0;
 	}
+	ber->ber_tag = *(unsigned char *)ber->ber_ptr;
 
 	return len;
 }
@@ -271,6 +288,7 @@ ber_get_stringb(
 	if ( (ber_len_t) ber_read( ber, buf, datalen ) != datalen ) {
 		return LBER_DEFAULT;
 	}
+	ber->ber_tag = *(unsigned char *)ber->ber_ptr;
 
 	buf[datalen] = '\0';
 
@@ -278,61 +296,98 @@ ber_get_stringb(
 	return tag;
 }
 
-enum bgbvc { ChArray, BvArray, BvVec };
+/* Definitions for get_string vector
+ *
+ * ChArray, BvArray, and BvVec are self-explanatory.
+ * BvOff is a struct berval embedded in an array of larger structures
+ * of siz bytes at off bytes from the beginning of the struct.
+ */
+enum bgbvc { ChArray, BvArray, BvVec, BvOff };
 
+/* Use this single cookie for state, to keep actual
+ * stack use to the absolute minimum.
+ */
 typedef struct bgbvr {
-	BerElement *ber;
 	enum bgbvc choice;
-	ber_tag_t tag;
-	ber_len_t len;
-	char *last;
+	BerElement *ber;
+	int alloc;
+	ber_len_t siz;
+	ber_len_t off;
 	union {
 		char ***c;
-		BVarray *ba;
+		BerVarray *ba;
 		struct berval ***bv;
 	} res;
 } bgbvr;
 
-ber_tag_t
-ber_get_stringbvr( bgbvr *b, int n )
+static ber_tag_t
+ber_get_stringbvl( bgbvr *b, ber_len_t *rlen )
 {
-	struct berval bv;
+	int i = 0, n;
+	ber_tag_t tag;
+	ber_len_t len;
+	char *last, *orig;
+	struct berval bv, *bvp = NULL;
+
+	/* For rewinding, just like ber_peek_tag() */
+	orig = b->ber->ber_ptr;
+	tag = b->ber->ber_tag;
+
+	if ( ber_first_element( b->ber, &len, &last ) != LBER_DEFAULT ) {
+		for ( ; b->ber->ber_ptr < last; i++ ) {
+			if (ber_skip_tag( b->ber, &len ) == LBER_DEFAULT) break;
+			b->ber->ber_ptr += len;
+			b->ber->ber_tag = *(unsigned char *)b->ber->ber_ptr;
+		}
+	}
 
-	if ( n )
-		b->tag = ber_next_element( b->ber, &b->len, b->last );
-	else
-		b->tag = ber_first_element( b->ber, &b->len, &b->last );
+	if ( rlen ) *rlen = i;
 
-	if ( b->tag == LBER_DEFAULT )
-	{
-		if ( n == 0 ) {
-			*b->res.c = NULL;
-			return 0;
-		}
-		/* do the allocation */
-		switch (b->choice) {
-		case ChArray:
-			*b->res.c = LBER_MALLOC( (n+1) * sizeof( char * ));
-			(*b->res.c)[n] = NULL;
-			break;
-		case BvArray:
-			*b->res.ba = LBER_MALLOC( (n+1) * sizeof( struct berval ));
-			(*b->res.ba)[n].bv_val = NULL;
-			break;
-		case BvVec:
-			*b->res.bv = LBER_MALLOC( (n+1) * sizeof( struct berval *));
-			(*b->res.bv)[n] = NULL;
-			break;
-		}
+	if ( i == 0 ) {
+		*b->res.c = NULL;
 		return 0;
 	}
 
-	if ( ber_get_stringbv( b->ber, &bv ) == LBER_DEFAULT )
-		return LBER_DEFAULT;
-
-	b->tag = ber_get_stringbvr( b, n+1 );
-	if ( b->tag == 0 )
+	n = i;
+
+	/* Allocate the result vector */
+	switch (b->choice) {
+	case ChArray:
+		*b->res.c = ber_memalloc_x( (n+1)*sizeof( char * ),
+			b->ber->ber_memctx);
+		if ( *b->res.c == NULL ) return LBER_DEFAULT;
+		(*b->res.c)[n] = NULL;
+		break;
+	case BvArray:
+		*b->res.ba = ber_memalloc_x( (n+1)*sizeof( struct berval ),
+			b->ber->ber_memctx);
+		if ( *b->res.ba == NULL ) return LBER_DEFAULT;
+		(*b->res.ba)[n].bv_val = NULL;
+		break;
+	case BvVec:
+		*b->res.bv = ber_memalloc_x( (n+1)*sizeof( struct berval *),
+			b->ber->ber_memctx);
+		if ( *b->res.bv == NULL ) return LBER_DEFAULT;
+		(*b->res.bv)[n] = NULL;
+		break;
+	case BvOff:
+		*b->res.ba = ber_memalloc_x( (n+1) * b->siz, b->ber->ber_memctx );
+		if ( *b->res.ba == NULL ) return LBER_DEFAULT;
+		((struct berval *)((long)(*b->res.ba) + n*b->siz +
+			b->off))->bv_val = NULL;
+		break;
+	}
+	b->ber->ber_ptr = orig;
+	b->ber->ber_tag = tag;
+	ber_skip_tag( b->ber, &len );
+	
+	for (n=0; n<i; n++)
 	{
+		tag = ber_next_element( b->ber, &len, last );
+		if ( ber_get_stringbv( b->ber, &bv, b->alloc ) == LBER_DEFAULT ) {
+			goto nomem;
+		}
+
 		/* store my result */
 		switch (b->choice) {
 		case ChArray:
@@ -342,17 +397,47 @@ ber_get_stringbvr( bgbvr *b, int n )
 			(*b->res.ba)[n] = bv;
 			break;
 		case BvVec:
-			(*b->res.bv)[n] = ber_bvdup( &bv );
+			bvp = ber_memalloc_x( sizeof( struct berval ), b->ber->ber_memctx);
+			if ( !bvp ) {
+				LBER_FREE(bv.bv_val);
+				goto nomem;
+			}
+			(*b->res.bv)[n] = bvp;
+			*bvp = bv;
+			break;
+		case BvOff:
+			*(BerVarray)((long)(*b->res.ba)+n*b->siz+b->off) = bv;
 			break;
 		}
-	} else {
-		LBER_FREE( bv.bv_val );
 	}
-	return b->tag;
+	return tag;
+
+nomem:
+	if (b->alloc || b->choice == BvVec) {
+		for (--n; n>=0; n--) {
+			switch(b->choice) {
+			case ChArray:
+				LBER_FREE((*b->res.c)[n]);
+				break;
+			case BvArray:
+				LBER_FREE((*b->res.ba)[n].bv_val);
+				break;
+			case BvVec:
+				LBER_FREE((*b->res.bv)[n]->bv_val);
+				LBER_FREE((*b->res.bv)[n]);
+				break;
+			default:
+				break;
+			}
+		}
+	}
+	LBER_FREE(*b->res.c);
+	*b->res.c = NULL;
+	return LBER_DEFAULT;
 }
 
 ber_tag_t
-ber_get_stringbv( BerElement *ber, struct berval *bv )
+ber_get_stringbv( BerElement *ber, struct berval *bv, int alloc )
 {
 	ber_tag_t	tag;
 
@@ -366,16 +451,78 @@ ber_get_stringbv( BerElement *ber, struct berval *bv )
 		return LBER_DEFAULT;
 	}
 
-	if ( (bv->bv_val = (char *) LBER_MALLOC( bv->bv_len + 1 )) == NULL ) {
+	if ( (ber_len_t) ber_pvt_ber_remaining( ber ) < bv->bv_len ) {
 		return LBER_DEFAULT;
 	}
 
-	if ( bv->bv_len > 0 && (ber_len_t) ber_read( ber, bv->bv_val,
-		bv->bv_len ) != bv->bv_len ) {
-		LBER_FREE( bv->bv_val );
+	if ( alloc ) {
+		bv->bv_val = (char *) ber_memalloc_x( bv->bv_len + 1,
+			ber->ber_memctx );
+		if ( bv->bv_val == NULL ) {
+			return LBER_DEFAULT;
+		}
+
+		if ( bv->bv_len > 0 && (ber_len_t) ber_read( ber, bv->bv_val,
+			bv->bv_len ) != bv->bv_len )
+		{
+			LBER_FREE( bv->bv_val );
+			bv->bv_val = NULL;
+			return LBER_DEFAULT;
+		}
+	} else {
+		bv->bv_val = ber->ber_ptr;
+		ber->ber_ptr += bv->bv_len;
+	}
+	ber->ber_tag = *(unsigned char *)ber->ber_ptr;
+	bv->bv_val[bv->bv_len] = '\0';
+
+	return tag;
+}
+
+ber_tag_t
+ber_get_stringbv_null( BerElement *ber, struct berval *bv, int alloc )
+{
+	ber_tag_t	tag;
+
+	assert( ber != NULL );
+	assert( bv != NULL );
+
+	assert( LBER_VALID( ber ) );
+
+	if ( (tag = ber_skip_tag( ber, &bv->bv_len )) == LBER_DEFAULT ) {
 		bv->bv_val = NULL;
 		return LBER_DEFAULT;
 	}
+
+	if ( (ber_len_t) ber_pvt_ber_remaining( ber ) < bv->bv_len ) {
+		return LBER_DEFAULT;
+	}
+
+	if ( bv->bv_len == 0 ) {
+		bv->bv_val = NULL;
+		ber->ber_tag = *(unsigned char *)ber->ber_ptr;
+		return tag;
+	}
+
+	if ( alloc ) {
+		bv->bv_val = (char *) ber_memalloc_x( bv->bv_len + 1,
+			ber->ber_memctx );
+		if ( bv->bv_val == NULL ) {
+			return LBER_DEFAULT;
+		}
+
+		if ( bv->bv_len > 0 && (ber_len_t) ber_read( ber, bv->bv_val,
+			bv->bv_len ) != bv->bv_len )
+		{
+			LBER_FREE( bv->bv_val );
+			bv->bv_val = NULL;
+			return LBER_DEFAULT;
+		}
+	} else {
+		bv->bv_val = ber->ber_ptr;
+		ber->ber_ptr += bv->bv_len;
+	}
+	ber->ber_tag = *(unsigned char *)ber->ber_ptr;
 	bv->bv_val[bv->bv_len] = '\0';
 
 	return tag;
@@ -389,7 +536,21 @@ ber_get_stringa( BerElement *ber, char **buf )
 
 	assert( buf != NULL );
 
-	tag = ber_get_stringbv( ber, &bv );
+	tag = ber_get_stringbv( ber, &bv, 1 );
+	*buf = bv.bv_val;
+
+	return tag;
+}
+
+ber_tag_t
+ber_get_stringa_null( BerElement *ber, char **buf )
+{
+	BerValue	bv;
+	ber_tag_t	tag;
+
+	assert( buf != NULL );
+
+	tag = ber_get_stringbv_null( ber, &bv, 1 );
 	*buf = bv.bv_val;
 
 	return tag;
@@ -403,12 +564,13 @@ ber_get_stringal( BerElement *ber, struct berval **bv )
 	assert( ber != NULL );
 	assert( bv != NULL );
 
-	*bv = (struct berval *) LBER_MALLOC( sizeof(struct berval) );
+	*bv = (struct berval *) ber_memalloc_x( sizeof(struct berval),
+		ber->ber_memctx );
 	if ( *bv == NULL ) {
 		return LBER_DEFAULT;
 	}
 
-	tag = ber_get_stringbv( ber, *bv );
+	tag = ber_get_stringbv( ber, *bv, 1 );
 	if ( tag == LBER_DEFAULT ) {
 		LBER_FREE( *bv );
 		*bv = NULL;
@@ -438,7 +600,8 @@ ber_get_bitstringa(
 	}
 	--datalen;
 
-	if ( (*buf = (char *) LBER_MALLOC( datalen )) == NULL ) {
+	*buf = (char *) ber_memalloc_x( datalen, ber->ber_memctx );
+	if ( *buf == NULL ) {
 		return LBER_DEFAULT;
 	}
 
@@ -453,6 +616,7 @@ ber_get_bitstringa(
 		*buf = NULL;
 		return LBER_DEFAULT;
 	}
+	ber->ber_tag = *(unsigned char *)ber->ber_ptr;
 
 	*blen = datalen * 8 - unusedbits;
 	return tag;
@@ -474,6 +638,7 @@ ber_get_null( BerElement *ber )
 	if ( len != 0 ) {
 		return LBER_DEFAULT;
 	}
+	ber->ber_tag = *(unsigned char *)ber->ber_ptr;
 
 	return( tag );
 }
@@ -512,6 +677,7 @@ ber_first_element(
 		*last = NULL;
 		return LBER_DEFAULT;
 	}
+	ber->ber_tag = *(unsigned char *)ber->ber_ptr;
 
 	*last = ber->ber_ptr + *len;
 
@@ -534,16 +700,13 @@ ber_next_element(
 
 	assert( LBER_VALID( ber ) );
 
-	if ( ber->ber_ptr == last ) {
+	if ( ber->ber_ptr >= last ) {
 		return LBER_DEFAULT;
 	}
 
 	return ber_peek_tag( ber, len );
 }
 
-/* Hopefully no one sends vectors with more elements than this */
-/* #define	TMP_SLOTS	1024 */
-
 /* VARARGS */
 ber_tag_t
 ber_scanf ( BerElement *ber,
@@ -552,14 +715,12 @@ ber_scanf ( BerElement *ber,
 {
 	va_list		ap;
 	LDAP_CONST char		*fmt_reset;
-	char		*last;
-	char		*s, **ss, ***sss;
-	struct berval	***bv, **bvp, *bval;
+	char		*s, **ss;
+	struct berval	**bvp, *bval;
 	ber_int_t	*i;
-	int j;
 	ber_len_t	*l;
 	ber_tag_t	*t;
-	ber_tag_t	rc, tag;
+	ber_tag_t	rc;
 	ber_len_t	len;
 
 	va_start( ap, fmt );
@@ -571,14 +732,9 @@ ber_scanf ( BerElement *ber,
 
 	fmt_reset = fmt;
 
-#ifdef NEW_LOGGING
-	LDAP_LOG(( "liblber", LDAP_LEVEL_ENTRY, "ber_scanf fmt (%s) ber:\n", fmt ));
-	BER_DUMP(( "liblber", LDAP_LEVEL_DETAIL2, ber, 1 ));
-#else
 	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 );
-#endif
 
 	for ( rc = 0; *fmt && rc != LBER_DEFAULT; fmt++ ) {
 		/* When this is modified, remember to update
@@ -599,11 +755,23 @@ ber_scanf ( BerElement *ber,
 			rc = ber_get_stringa( ber, ss );
 			break;
 
+		case 'A':	/* octet string - allocate storage as needed,
+				 * but return NULL if len == 0 */
+			ss = va_arg( ap, char ** );
+			rc = ber_get_stringa_null( ber, ss );
+			break;
+
 		case 'b':	/* boolean */
 			i = va_arg( ap, ber_int_t * );
 			rc = ber_get_boolean( ber, i );
 			break;
 
+		case 'B':	/* bit string - allocate storage as needed */
+			ss = va_arg( ap, char ** );
+			l = va_arg( ap, ber_len_t * ); /* for length, in bits */
+			rc = ber_get_bitstringa( ber, ss, l );
+			break;
+
 		case 'e':	/* enumerated */
 		case 'i':	/* int */
 			i = va_arg( ap, ber_int_t * );
@@ -615,19 +783,35 @@ ber_scanf ( BerElement *ber,
 			rc = ber_peek_tag( ber, l );
 			break;
 
-		case 'n':	/* null */
-			rc = ber_get_null( ber );
+		case 'm':	/* octet string in berval, in-place */
+			bval = va_arg( ap, struct berval * );
+			rc = ber_get_stringbv( ber, bval, 0 );
 			break;
 
-		case 's':	/* octet string - in a buffer */
-			s = va_arg( ap, char * );
+		case 'M':	/* bvoffarray - must include address of
+				 * a record len, and record offset.
+				 * number of records will be returned thru
+				 * len ptr on finish. parsed in-place.
+				 */
+		{
+			bgbvr cookie = { BvOff };
+			cookie.ber = ber;
+			cookie.res.ba = va_arg( ap, struct berval ** );
+			cookie.alloc = 0;
 			l = va_arg( ap, ber_len_t * );
-			rc = ber_get_stringb( ber, s, l );
+			cookie.siz = *l;
+			cookie.off = va_arg( ap, ber_len_t );
+			rc = ber_get_stringbvl( &cookie, l );
+			break;
+		}
+
+		case 'n':	/* null */
+			rc = ber_get_null( ber );
 			break;
 
 		case 'o':	/* octet string in a supplied berval */
 			bval = va_arg( ap, struct berval * );
-			rc = ber_get_stringbv( ber, bval );
+			rc = ber_get_stringbv( ber, bval, 1 );
 			break;
 
 		case 'O':	/* octet string - allocate & include length */
@@ -635,10 +819,10 @@ ber_scanf ( BerElement *ber,
 			rc = ber_get_stringal( ber, bvp );
 			break;
 
-		case 'B':	/* bit string - allocate storage as needed */
-			ss = va_arg( ap, char ** );
-			l = va_arg( ap, ber_len_t * ); /* for length, in bits */
-			rc = ber_get_bitstringa( ber, ss, l );
+		case 's':	/* octet string - in a buffer */
+			s = va_arg( ap, char * );
+			l = va_arg( ap, ber_len_t * );
+			rc = ber_get_stringb( ber, s, l );
 			break;
 
 		case 't':	/* tag of next item */
@@ -653,113 +837,31 @@ ber_scanf ( BerElement *ber,
 
 		case 'v':	/* sequence of strings */
 		{
-#ifdef TMP_SLOTS
-			char *tmp[TMP_SLOTS];
-			sss = va_arg( ap, char *** );
-			*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 ) )
-			{
-				rc = ber_get_stringa( ber, &tmp[j] );
-				j++;
-				assert(j < TMP_SLOTS);
-			}
-			if (j > 0 && rc != LBER_DEFAULT ) {
-				*sss = (char **)LBER_MALLOC( (j+1) * sizeof(char *));
-				if (*sss == NULL) {
-					rc = LBER_DEFAULT;
-				} else {
-					(*sss)[j] = NULL;
-					for (j--; j>=0; j--)
-						(*sss)[j] = tmp[j];
-				}
-			}
-			if ( rc == LBER_DEFAULT ) {
-				for (j--; j>=0; j--)
-					LBER_FREE(tmp[j]);
-			}
-#else
-			bgbvr cookie = { ber, ChArray };
+			bgbvr cookie = { ChArray };
+			cookie.ber = ber;
 			cookie.res.c = va_arg( ap, char *** );
-			rc = ber_get_stringbvr( &cookie, 0 );
-#endif
+			cookie.alloc = 1;
+			rc = ber_get_stringbvl( &cookie, NULL );
 			break;
 		}
 
 		case 'V':	/* sequence of strings + lengths */
 		{
-#ifdef TMP_SLOTS
-			struct berval *tmp[TMP_SLOTS];
-			bv = va_arg( ap, struct berval *** );
-			*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 ) )
-			{
-				rc = ber_get_stringal( ber, &tmp[j] );
-				j++;
-				assert( j < TMP_SLOTS);
-			}
-			if (j > 0 && rc != LBER_DEFAULT ) {
-				*bv = (struct berval **)LBER_MALLOC( (j+1) * sizeof(struct berval *));
-				if (*bv == NULL) {
-					rc = LBER_DEFAULT;
-				} else {
-					(*bv)[j] = NULL;
-					for (j--; j>=0; j--)
-						(*bv)[j] = tmp[j];
-				}
-			}
-			if ( rc == LBER_DEFAULT ) {
-				for (j--; j>=0; j--)
-					ber_bvfree(tmp[j]);
-			}
-#else
-			bgbvr cookie = { ber, BvVec };
+			bgbvr cookie = { BvVec };
+			cookie.ber = ber;
 			cookie.res.bv = va_arg( ap, struct berval *** );
-			rc = ber_get_stringbvr( &cookie, 0 );
-#endif
+			cookie.alloc = 1;
+			rc = ber_get_stringbvl( &cookie, NULL );
 			break;
 		}
 
 		case 'W':	/* bvarray */
 		{
-#ifdef TMP_SLOTS
-			struct berval tmp[TMP_SLOTS];
-			bvp = va_arg( ap, struct berval ** );
-			*bvp = NULL;
-			j = 0;
-			for ( tag = ber_first_element( ber, &len, &last );
-			    tag != LBER_DEFAULT && rc != LBER_DEFAULT;
-			    tag = ber_next_element( ber, &len, last ) )
-			{
-				rc = ber_get_stringbv( ber, &tmp[j] );
-				j++;
-				assert( j < TMP_SLOTS);
-			}
-			if (j > 0 && rc != LBER_DEFAULT ) {
-				*bvp = (struct berval *)LBER_MALLOC( (j+1) * sizeof(struct berval));
-				if (*bvp == NULL) {
-					rc = LBER_DEFAULT;
-				} else {
-					(*bvp)[j].bv_val = NULL;
-					(*bvp)[j].bv_len = 0;
-					for (j--; j>=0; j--)
-						(*bvp)[j] = tmp[j];
-				}
-			}
-			if ( rc == LBER_DEFAULT ) {
-				for (j--; j>=0; j--)
-					LBER_FREE(tmp[j].bv_val);
-			}
-#else
-			bgbvr cookie = { ber, BvArray };
+			bgbvr cookie = { BvArray };
+			cookie.ber = ber;
 			cookie.res.ba = va_arg( ap, struct berval ** );
-			rc = ber_get_stringbvr( &cookie, 0 );
-#endif
+			cookie.alloc = 1;
+			rc = ber_get_stringbvl( &cookie, NULL );
 			break;
 		}
 
@@ -767,12 +869,13 @@ ber_scanf ( BerElement *ber,
 			if ( (rc = ber_skip_tag( ber, &len )) == LBER_DEFAULT )
 				break;
 			ber->ber_ptr += len;
+			ber->ber_tag = *(unsigned char *)ber->ber_ptr;
 			break;
 
 		case '{':	/* begin sequence */
 		case '[':	/* begin set */
 			if ( *(fmt + 1) != 'v' && *(fmt + 1) != 'V'
-				&& *(fmt + 1) != 'W' )
+				&& *(fmt + 1) != 'W' && *(fmt + 1) != 'M' )
 				rc = ber_skip_tag( ber, &len );
 			break;
 
@@ -782,13 +885,8 @@ ber_scanf ( BerElement *ber,
 
 		default:
 			if( ber->ber_debug ) {
-#ifdef NEW_LOGGING
-				LDAP_LOG(( "liblber", LDAP_LEVEL_ERR,
-					   "ber_scanf: unknown fmt %c\n", *fmt ));
-#else
 				ber_log_printf( LDAP_DEBUG_ANY, ber->ber_debug,
 					"ber_scanf: unknown fmt %c\n", *fmt );
-#endif
 			}
 			rc = LBER_DEFAULT;
 			break;
@@ -797,13 +895,13 @@ ber_scanf ( BerElement *ber,
 
 	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.
-	     */
-	    va_start( ap, fmt );
+		/*
+		 * 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++ ) {
+		for ( ; fmt_reset < fmt; fmt_reset++ ) {
 		switch ( *fmt_reset ) {
 		case '!': { /* Hook */
 				BERDecodeCallback *f;
@@ -816,6 +914,7 @@ ber_scanf ( BerElement *ber,
 			} break;
 
 		case 'a':	/* octet string - allocate storage as needed */
+		case 'A':
 			ss = va_arg( ap, char ** );
 			if ( *ss ) {
 				LBER_FREE( *ss );
@@ -829,20 +928,10 @@ ber_scanf ( BerElement *ber,
 			(void) va_arg( ap, int * );
 			break;
 
-		case 's':	/* octet string - in a buffer */
-			(void) va_arg( ap, char * );
-			(void) va_arg( ap, ber_len_t * );
-			break;
-
 		case 'l':	/* length of next item */
 			(void) va_arg( ap, ber_len_t * );
 			break;
 
-		case 't':	/* tag of next item */
-		case 'T':	/* skip tag of next item */
-			(void) va_arg( ap, ber_tag_t * );
-			break;
-
 		case 'o':	/* octet string in a supplied berval */
 			bval = va_arg( ap, struct berval * );
 			if ( bval->bv_val != NULL ) {
@@ -860,6 +949,16 @@ ber_scanf ( BerElement *ber,
 			}
 			break;
 
+		case 's':	/* octet string - in a buffer */
+			(void) va_arg( ap, char * );
+			(void) va_arg( ap, ber_len_t * );
+			break;
+
+		case 't':	/* tag of next item */
+		case 'T':	/* skip tag of next item */
+			(void) va_arg( ap, ber_tag_t * );
+			break;
+
 		case 'B':	/* bit string - allocate storage as needed */
 			ss = va_arg( ap, char ** );
 			if ( *ss ) {
@@ -869,10 +968,12 @@ ber_scanf ( BerElement *ber,
 			*(va_arg( ap, ber_len_t * )) = 0; /* for length, in bits */
 			break;
 
+		case 'm':	/* berval in-place */
+		case 'M':	/* BVoff array in-place */
+		case 'n':	/* null */
 		case 'v':	/* sequence of strings */
 		case 'V':	/* sequence of strings + lengths */
-		case 'W':	/* BVarray */
-		case 'n':	/* null */
+		case 'W':	/* BerVarray */
 		case 'x':	/* skip the next element - whatever it is */
 		case '{':	/* begin sequence */
 		case '[':	/* begin set */
@@ -884,9 +985,9 @@ ber_scanf ( BerElement *ber,
 			/* format should be good */
 			assert( 0 );
 		}
-	    }
+		}
 
-	    va_end( ap );
+		va_end( ap );
 	}
 
 	return rc;