--- libraries/liblber/decode.c	2002/01/06 04:36:07	1.80
+++ libraries/liblber/decode.c	2003/01/23 01:19:59	1.89
@@ -1,7 +1,7 @@
 /* decode.c - ber input decoding routines */
-/* $OpenLDAP: pkg/ldap/libraries/liblber/decode.c,v 1.78 2002/01/06 01:23:36 hyc Exp $ */
+/* $OpenLDAP: pkg/ldap/libraries/liblber/decode.c,v 1.88 2003/01/19 13:02:06 hallvard Exp $ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* Portions
@@ -141,11 +141,6 @@ ber_skip_tag( BerElement *ber, ber_len_t
 		*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;
@@ -299,8 +294,8 @@ enum bgbvc { ChArray, BvArray, BvVec, Bv
  * stack use to the absolute minimum.
  */
 typedef struct bgbvr {
-	BerElement *ber;
 	enum bgbvc choice;
+	BerElement *ber;
 	ber_tag_t tag;
 	ber_len_t len;
 	char *last;
@@ -309,7 +304,7 @@ typedef struct bgbvr {
 	ber_len_t off;
 	union {
 		char ***c;
-		BVarray *ba;
+		BerVarray *ba;
 		struct berval ***bv;
 	} res;
 } bgbvr;
@@ -395,7 +390,7 @@ ber_get_stringbvr( bgbvr *b, int n )
 			*bvp = bv;
 			break;
 		case BvOff:
-			*(BVarray)((long)(*b->res.ba)+n*b->siz+b->off) = bv;
+			*(BerVarray)((long)(*b->res.ba)+n*b->siz+b->off) = bv;
 		}
 	} else {
 		/* Failure will propagate up and free in reverse
@@ -422,7 +417,7 @@ ber_get_stringbv( BerElement *ber, struc
 		return LBER_DEFAULT;
 	}
 
-	if ( ber_pvt_ber_remaining( ber ) < bv->bv_len ) {
+	if ( (ber_len_t) ber_pvt_ber_remaining( ber ) < bv->bv_len ) {
 		return LBER_DEFAULT;
 	}
 
@@ -603,7 +598,7 @@ ber_next_element(
 
 	assert( LBER_VALID( ber ) );
 
-	if ( ber->ber_ptr == last ) {
+	if ( ber->ber_ptr >= last ) {
 		return LBER_DEFAULT;
 	}
 
@@ -619,13 +614,6 @@ ber_scanf ( BerElement *ber,
 	va_list		ap;
 	LDAP_CONST char		*fmt_reset;
 	char		*s, **ss;
-#ifdef TMP_SLOTS
-	char		*last;
-	char ***sss;
-	ber_tag_t tag;
-	struct berval ***bv;
-	int j;
-#endif
 	struct berval	**bvp, *bval;
 	ber_int_t	*i;
 	ber_len_t	*l;
@@ -643,8 +631,10 @@ 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 ));
+	LDAP_LOG( BER, ENTRY, "ber_scanf fmt (%s) ber:\n", fmt, 0, 0 );
+
+	if ( LDAP_LOGS_TEST(BER, DETAIL2 ))
+			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 );
@@ -729,7 +719,8 @@ ber_scanf ( BerElement *ber,
 
 		case 'v':	/* sequence of strings */
 		{
-			bgbvr cookie = { ber, ChArray };
+			bgbvr cookie = { ChArray };
+			cookie.ber = ber;
 			cookie.res.c = va_arg( ap, char *** );
 			cookie.alloc = 1;
 			rc = ber_get_stringbvr( &cookie, 0 );
@@ -738,7 +729,8 @@ ber_scanf ( BerElement *ber,
 
 		case 'V':	/* sequence of strings + lengths */
 		{
-			bgbvr cookie = { ber, BvVec };
+			bgbvr cookie = { BvVec };
+			cookie.ber = ber;
 			cookie.res.bv = va_arg( ap, struct berval *** );
 			cookie.alloc = 1;
 			rc = ber_get_stringbvr( &cookie, 0 );
@@ -747,20 +739,22 @@ ber_scanf ( BerElement *ber,
 
 		case 'W':	/* bvarray */
 		{
-			bgbvr cookie = { ber, BvArray };
+			bgbvr cookie = { BvArray };
+			cookie.ber = ber;
 			cookie.res.ba = va_arg( ap, struct berval ** );
 			cookie.alloc = 1;
 			rc = ber_get_stringbvr( &cookie, 0 );
 			break;
 		}
 
-		case 'w':	/* bvoffarray - must include address of
+		case 'M':	/* bvoffarray - must include address of
 				 * a record len, and record offset.
 				 * number of records will be returned thru
-				 * len ptr on finish.
+				 * len ptr on finish. parsed in-place.
 				 */
 		{
-			bgbvr cookie = { ber, BvOff };
+			bgbvr cookie = { BvOff };
+			cookie.ber = ber;
 			cookie.res.ba = va_arg( ap, struct berval ** );
 			cookie.alloc = 0;
 			l = va_arg( ap, ber_len_t * );
@@ -781,7 +775,7 @@ ber_scanf ( BerElement *ber,
 		case '{':	/* begin sequence */
 		case '[':	/* begin set */
 			if ( *(fmt + 1) != 'v' && *(fmt + 1) != 'V'
-				&& *(fmt + 1) != 'W' && *(fmt + 1) != 'w' )
+				&& *(fmt + 1) != 'W' && *(fmt + 1) != 'M' )
 				rc = ber_skip_tag( ber, &len );
 			break;
 
@@ -792,8 +786,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 ));
+				LDAP_LOG( BER, ERR, 
+					"ber_scanf: unknown fmt %c\n", *fmt, 0, 0 );
 #else
 				ber_log_printf( LDAP_DEBUG_ANY, ber->ber_debug,
 					"ber_scanf: unknown fmt %c\n", *fmt );
@@ -880,7 +874,9 @@ ber_scanf ( BerElement *ber,
 
 		case 'v':	/* sequence of strings */
 		case 'V':	/* sequence of strings + lengths */
-		case 'W':	/* BVarray */
+		case 'W':	/* BerVarray */
+		case 'm':	/* berval in-place */
+		case 'M':	/* BVoff array in-place */
 		case 'n':	/* null */
 		case 'x':	/* skip the next element - whatever it is */
 		case '{':	/* begin sequence */