libraries/liblber/decode.c - diff

Return to decode.c CVS log

Up to [OpenLDAP] / libraries / liblber

Diff for /libraries/liblber/decode.c between versions 1.105.2.3 and 1.129

version 1.105.2.3, 2007/10/18 01:37:30	version 1.129, 2009/11/04 10:17:03
Line 1	Line 1
/* decode.c - ber input decoding routines */	/* decode.c - ber input decoding routines */
/* $OpenLDAP: pkg/ldap/libraries/liblber/decode.c,v 1.105.2.2 2007/08/31 23:13:54 quanah Exp $ */	/* $OpenLDAP: pkg/ldap/libraries/liblber/decode.c,v 1.128 2009/10/28 22:00:27 hallvard Exp $ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.	/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*	*
* Copyright 1998-2007 The OpenLDAP Foundation.	* Copyright 1998-2009 The OpenLDAP Foundation.
* All rights reserved.	* All rights reserved.
*	*
* Redistribution and use in source and binary forms, with or without	* Redistribution and use in source and binary forms, with or without
Line 33	Line 33
#include <stdio.h>	#include <stdio.h>

#include <ac/stdlib.h>	#include <ac/stdlib.h>

#include <ac/stdarg.h>	#include <ac/stdarg.h>
#include <ac/string.h>	#include <ac/string.h>
#include <ac/socket.h>	#include <ac/socket.h>

#include "lber-int.h"	#include "lber-int.h"

static ber_len_t ber_getnint LDAP_P((
BerElement *ber,
ber_int_t *num,
ber_len_t len ));

/* out->bv_len should be the buffer size on input */	/* out->bv_len should be the buffer size on input */
int	int
Line 69 ber_decode_oid( BerValue in, BerValue	Line 64 ber_decode_oid( BerValue in, BerValue
val \|= der[i] & 0x7f;	val \|= der[i] & 0x7f;
if ( !( der[i] & 0x80 )) {	if ( !( der[i] & 0x80 )) {
if ( ptr == NULL ) {	if ( ptr == NULL ) {
/* Initial "x.y": val=x40+y, x<=2, y<40 if x=2 /	/* Initial "x.y": val=x40+y, x<=2, y<40 if x<2 /
ptr = out->bv_val;	ptr = out->bv_val;
val1 = (val < 80 ? val/40 : 2);	val1 = (val < 80 ? val/40 : 2);
val -= val1*40;	val -= val1*40;
Line 91 ber_decode_oid( BerValue in, BerValue	Line 86 ber_decode_oid( BerValue in, BerValue
return 0;	return 0;
}	}

/* return the tag - LBER_DEFAULT returned means trouble */	/* Return tag, with bv = rest of element (starting at length octets) /
ber_tag_t	static ber_tag_t
ber_get_tag( BerElement *ber )	ber_tag_and_rest( const BerElement ber, struct berval bv )
{	{
unsigned char xbyte;
ber_tag_t tag;	ber_tag_t tag;
unsigned int i;	ptrdiff_t rest;
	unsigned char *ptr;

assert( ber != NULL );	assert( ber != NULL );
assert( LBER_VALID( ber ) );	assert( LBER_VALID( ber ) );

if ( ber_pvt_ber_remaining( ber ) < 1 ) {	ptr = (unsigned char *) ber->ber_ptr;
return LBER_DEFAULT;	rest = (unsigned char *) ber->ber_end - ptr;
	if ( rest <= 0 ) {
	goto fail;
}	}

if ( ber->ber_ptr == ber->ber_buf ) {	tag = ber->ber_tag;
tag = (unsigned char )ber->ber_ptr;	if ( (char *) ptr == ber->ber_buf ) {
} else {	tag = *ptr;
tag = ber->ber_tag;
}	}
ber->ber_ptr++;	ptr++;
	rest--;
if ( (tag & LBER_BIG_TAG_MASK) != LBER_BIG_TAG_MASK ) {	if ( (tag & LBER_BIG_TAG_MASK) != LBER_BIG_TAG_MASK ) {
return tag;	goto done;
}	}

for ( i = 1; i < sizeof(ber_tag_t); i++ ) {	do {
if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 ) {	if ( rest <= 0 ) {
return LBER_DEFAULT;	break;
}	}

tag <<= 8;	tag <<= 8;
tag \|= 0x00ffUL & (ber_tag_t) xbyte;	tag \|= *ptr++ & 0xffU;
	rest--;

if ( ! (xbyte & LBER_MORE_TAG_MASK) ) {	if ( ! (tag & LBER_MORE_TAG_MASK) ) {
break;	goto done;
}	}
}	} while ( tag <= (ber_tag_t)-1 / 256 );

/* tag too big! */	fail:
if ( i == sizeof(ber_tag_t) ) {	/* Error or unsupported tag size */
return LBER_DEFAULT;	tag = LBER_DEFAULT;
}
	done:
	bv->bv_len = rest;
	bv->bv_val = (char *) ptr;
	return tag;
	}

	/* Return the tag - LBER_DEFAULT returned means trouble */
	ber_tag_t
	ber_get_tag( BerElement *ber )
	{
	struct berval bv;
	ber_tag_t tag = ber_tag_and_rest( ber, &bv );

	ber->ber_ptr = bv.bv_val;
return tag;	return tag;
}	}

	/* Return next element's tag and point bv at its contents in-place /
ber_tag_t	ber_tag_t
ber_skip_tag( BerElement ber, ber_len_t len )	ber_peek_element( const BerElement ber, struct berval bv )
{	{
ber_tag_t tag;	ber_tag_t tag;
unsigned char lc;	ber_len_t len, rest;
ber_len_t i, noctets;	unsigned i;
unsigned char netlen[sizeof(ber_len_t)];	unsigned char *ptr;

assert( ber != NULL );	assert( bv != NULL );
assert( len != NULL );
assert( LBER_VALID( ber ) );

/*	/*
* Any ber element looks like this: tag length contents.	* Any ber element looks like this: tag length contents.
* Assuming everything's ok, we return the tag byte (we	* Assuming everything's ok, we return the tag, and point
* can assume a single byte), and return the length in len.	* bv at the contents.
*	*
* Assumptions:	* Assumptions:
* 1) definite lengths	* 1) definite lengths
* 2) primitive encodings used whenever possible	* 2) primitive encodings used whenever possible
*/	*/

*len = 0;	len = 0;

/*	/*
* First, we read the tag.	* First, we read the tag.
*/	*/
	tag = ber_tag_and_rest( ber, bv );

if ( (tag = ber_get_tag( ber )) == LBER_DEFAULT ) {	rest = bv->bv_len;
return LBER_DEFAULT;	ptr = (unsigned char *) bv->bv_val;
	if ( tag == LBER_DEFAULT \|\| rest == 0 ) {
	goto fail;
}	}

/*	/*
* Next, read the length. The first byte contains the length of	* Next, read the length. The first octet determines the length
* the length. If bit 8 is set, the length is the long form,	* of the length. If bit 8 is 0, the length is the short form,
* otherwise it's the short form. We don't allow a length that's	* otherwise if the octet != 0x80 it's the long form, otherwise
* greater than what we can hold in a ber_len_t.	* the ber element has the unsupported indefinite-length format.
	* Lengths that do not fit in a ber_len_t are not accepted.
*/	*/

if ( ber_read( ber, (char *) &lc, 1 ) != 1 ) {	len = *ptr++;
return LBER_DEFAULT;	rest--;
}

if ( lc & 0x80U ) {	if ( len & 0x80U ) {
noctets = (lc & 0x7fU);	len &= 0x7fU;
	if ( len - 1U > sizeof(ber_len_t) - 1U \|\| rest < len ) {
if ( noctets > sizeof(ber_len_t) ) {	/* Indefinite-length/too long length/not enough data */
return LBER_DEFAULT;	goto fail;
}	}

if( (unsigned) ber_read( ber, (char *) netlen, noctets ) != noctets ) {	rest -= len;
return LBER_DEFAULT;	i = len;
	for( len = ptr++ & 0xffU; --i; len \|= ptr++ & 0xffU ) {
	len <<= 8;
}	}

for( i = 0; i < noctets; i++ ) {
*len <<= 8;
*len \|= netlen[i];
}

} else {
*len = lc;
}	}

/* BER element should have enough data left */	/* BER element should have enough data left */
if( *len > (ber_len_t) ber_pvt_ber_remaining( ber ) ) {	if( len > rest ) {
return LBER_DEFAULT;	fail:
	tag = LBER_DEFAULT;
	}

	bv->bv_len = len;
	bv->bv_val = (char *) ptr;
	return tag;
	}

	/* Move past next element, point *bv at it in-place, and return its tag.
	* The caller may \0-terminate *bv, as next octet is saved in ber->ber_tag.
	* Similar to ber_get_stringbv(ber, bv, LBER_BV_NOTERM) except on error.
	*/
	ber_tag_t
	ber_skip_element( BerElement ber, struct berval bv )
	{
	ber_tag_t tag = ber_peek_element( ber, bv );

	if ( tag != LBER_DEFAULT ) {
	ber->ber_ptr = bv->bv_val + bv->bv_len;
	ber->ber_tag = (unsigned char ) ber->ber_ptr;
}	}
ber->ber_tag = (unsigned char )ber->ber_ptr;

return tag;	return tag;
}	}
Line 215 ber_peek_tag(	Line 239 ber_peek_tag(
BerElement *ber,	BerElement *ber,
ber_len_t *len )	ber_len_t *len )
{	{
/*	struct berval bv;
* This implementation assumes ber_skip_tag() only	ber_tag_t tag = ber_peek_element( ber, &bv );
* modifies ber_ptr field of the BerElement.
*/

char *save;	*len = bv.bv_len;
ber_tag_t tag, old;	return tag;
	}

old = ber->ber_tag;	ber_tag_t
save = ber->ber_ptr;	ber_skip_tag( BerElement ber, ber_len_t lenp )
tag = ber_skip_tag( ber, len );	{
ber->ber_ptr = save;	struct berval bv;
ber->ber_tag = old;	ber_tag_t tag = ber_peek_element( ber, &bv );

	ber->ber_ptr = bv.bv_val;
	ber->ber_tag = (unsigned char ) ber->ber_ptr;

	*lenp = bv.bv_len;
return tag;	return tag;
}	}

static ber_len_t	ber_tag_t
ber_getnint(	ber_get_int(
BerElement *ber,	BerElement *ber,
ber_int_t *num,	ber_int_t *num )
ber_len_t len )
{	{
unsigned char buf[sizeof(ber_int_t)];	ber_tag_t tag;
	ber_len_t len;
	struct berval bv;

assert( ber != NULL );
assert( num != NULL );	assert( num != NULL );
assert( LBER_VALID( ber ) );

/*
* The tag and length have already been stripped off. We should
* be sitting right before len bytes of 2's complement integer,
* ready to be read straight into an int. We may have to sign
* extend after we read it in.
*/

if ( len > sizeof(ber_int_t) ) {	tag = ber_skip_element( ber, &bv );
return -1;	len = bv.bv_len;
}	if ( tag == LBER_DEFAULT \|\| len > sizeof(ber_int_t) ) {
	return LBER_DEFAULT;
/* read into the low-order bytes of our buffer */
if ( (ber_len_t) ber_read( ber, (char *) buf, len ) != len ) {
return -1;
}	}

	/* parse two's complement integer */
if( len ) {	if( len ) {
/* sign extend if necessary */	unsigned char buf = (unsigned char ) bv.bv_val;
ber_len_t i;	ber_len_t i;
ber_int_t netnum = 0x80 & buf[0] ? -1 : 0;	ber_int_t netnum = buf[0] & 0xff;

	/* sign extend */
	netnum = (netnum ^ 0x80) - 0x80;

/* shift in the bytes */	/* shift in the bytes */
for( i=0 ; i<len; i++ ) {	for( i = 1; i < len; i++ ) {
netnum = (netnum << 8 ) \| buf[i];	netnum = (netnum << 8 ) \| buf[i];
}	}

Line 275 ber_getnint(	Line 295 ber_getnint(
} else {	} else {
*num = 0;	*num = 0;
}	}
ber->ber_tag = (unsigned char )ber->ber_ptr;

return len;
}

ber_tag_t
ber_get_int(
BerElement *ber,
ber_int_t *num )
{
ber_tag_t tag;
ber_len_t len;

assert( ber != NULL );
assert( LBER_VALID( ber ) );

if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) {
return LBER_DEFAULT;
}

if ( ber_getnint( ber, num, len ) != len ) {
return LBER_DEFAULT;
}

return tag;	return tag;
}	}

Line 316 ber_get_stringb(	Line 313 ber_get_stringb(
char *buf,	char *buf,
ber_len_t *len )	ber_len_t *len )
{	{
ber_len_t datalen;	struct berval bv;
ber_tag_t tag;	ber_tag_t tag;

assert( ber != NULL );	if ( (tag = ber_skip_element( ber, &bv )) == LBER_DEFAULT ) {
assert( LBER_VALID( ber ) );

if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) {
return LBER_DEFAULT;	return LBER_DEFAULT;
}	}

/* must fit within allocated space with termination */	/* must fit within allocated space with termination */
if ( datalen >= *len ) {	if ( bv.bv_len >= *len ) {
return LBER_DEFAULT;
}

if ( (ber_len_t) ber_read( ber, buf, datalen ) != datalen ) {
return LBER_DEFAULT;	return LBER_DEFAULT;
}	}
ber->ber_tag = (unsigned char )ber->ber_ptr;

buf[datalen] = '\0';	memcpy( buf, bv.bv_val, bv.bv_len );
	buf[bv.bv_len] = '\0';

*len = datalen;	*len = bv.bv_len;
return tag;	return tag;
}	}

Line 354 enum bgbvc { ChArray, BvArray, BvVec, Bv	Line 344 enum bgbvc { ChArray, BvArray, BvVec, Bv
* stack use to the absolute minimum.	* stack use to the absolute minimum.
*/	*/
typedef struct bgbvr {	typedef struct bgbvr {
enum bgbvc choice;	const enum bgbvc choice;
BerElement *ber;	const int option; /* (ALLOC unless BvOff) \| (STRING if ChArray) */
int alloc;	ber_len_t siz; /* input array element size, output count */
ber_len_t siz;	ber_len_t off; /* BvOff offset to the struct berval */
ber_len_t off;	void *result;
union {
char ***c;
BerVarray *ba;
struct berval ***bv;
} res;
} bgbvr;	} bgbvr;

static ber_tag_t	static ber_tag_t
ber_get_stringbvl( bgbvr b, ber_len_t rlen )	ber_get_stringbvl( BerElement ber, bgbvr b )
{	{
int i = 0, n;	int i = 0, n;
ber_tag_t tag;	ber_tag_t tag;
ber_len_t len;	ber_len_t tot_size = 0, siz = b->siz;
char last, orig;	char last, orig;
struct berval bv, *bvp = NULL;	struct berval bv, *bvp = NULL;
	union stringbvl_u {
	char *ca; / ChArray */
	BerVarray ba; /* BvArray */
	struct berval *bv; / BvVec */
	char bo; / BvOff */
	} res;

	tag = ber_skip_tag( ber, &bv.bv_len );

/* For rewinding, just like ber_peek_tag() */	if ( tag != LBER_DEFAULT ) {
orig = b->ber->ber_ptr;	tag = 0;
tag = b->ber->ber_tag;	orig = ber->ber_ptr;
	last = orig + bv.bv_len;
if ( ber_first_element( b->ber, &len, &last ) != LBER_DEFAULT ) {
for ( ; b->ber->ber_ptr < last; i++ ) {	for ( ; ber->ber_ptr < last; i++, tot_size += siz ) {
if (ber_skip_tag( b->ber, &len ) == LBER_DEFAULT) break;	if ( ber_skip_element( ber, &bv ) == LBER_DEFAULT )
b->ber->ber_ptr += len;	break;
b->ber->ber_tag = (unsigned char )b->ber->ber_ptr;	}
	if ( ber->ber_ptr != last ) {
	i = 0;
	tag = LBER_DEFAULT;
}	}
}

if ( rlen ) *rlen = i;	ber->ber_ptr = orig;
	ber->ber_tag = (unsigned char ) orig;
	}

	b->siz = i;
if ( i == 0 ) {	if ( i == 0 ) {
*b->res.c = NULL;	return tag;
return 0;
}	}

n = i;	/* Allocate and NULL-terminate the result vector */
	b->result = ber_memalloc_x( tot_size + siz, ber->ber_memctx );
/* Allocate the result vector */	if ( b->result == NULL ) {
	return LBER_DEFAULT;
	}
switch (b->choice) {	switch (b->choice) {
case ChArray:	case ChArray:
b->res.c = ber_memalloc_x( (n+1)sizeof( char * ),	res.ca = b->result;
b->ber->ber_memctx);	res.ca[i] = NULL;
if ( *b->res.c == NULL ) return LBER_DEFAULT;
(*b->res.c)[n] = NULL;
break;	break;
case BvArray:	case BvArray:
b->res.ba = ber_memalloc_x( (n+1)sizeof( struct berval ),	res.ba = b->result;
b->ber->ber_memctx);	res.ba[i].bv_val = NULL;
if ( *b->res.ba == NULL ) return LBER_DEFAULT;
(*b->res.ba)[n].bv_val = NULL;
break;	break;
case BvVec:	case BvVec:
b->res.bv = ber_memalloc_x( (n+1)sizeof( struct berval *),	res.bv = b->result;
b->ber->ber_memctx);	res.bv[i] = NULL;
if ( *b->res.bv == NULL ) return LBER_DEFAULT;
(*b->res.bv)[n] = NULL;
break;	break;
case BvOff:	case BvOff:
b->res.ba = ber_memalloc_x( (n+1) b->siz, b->ber->ber_memctx );	res.bo = (char *) b->result + b->off;
if ( *b->res.ba == NULL ) return LBER_DEFAULT;	((struct berval *) (res.bo + tot_size))->bv_val = NULL;
((struct berval )((char )(b->res.ba) + nb->siz +	tot_size = 0;
b->off))->bv_val = NULL;
break;	break;
}	}
b->ber->ber_ptr = orig;
b->ber->ber_tag = tag;	n = 0;
ber_skip_tag( b->ber, &len );	do {
	tag = ber_get_stringbv( ber, &bv, b->option );
for (n=0; n<i; n++)	if ( tag == LBER_DEFAULT ) {
{	goto failed;
tag = ber_next_element( b->ber, &len, last );
if ( ber_get_stringbv( b->ber, &bv, b->alloc ) == LBER_DEFAULT ) {
goto nomem;
}	}

/* store my result */	/* store my result */
switch (b->choice) {	switch (b->choice) {
case ChArray:	case ChArray:
(*b->res.c)[n] = bv.bv_val;	res.ca[n] = bv.bv_val;
break;	break;
case BvArray:	case BvArray:
(*b->res.ba)[n] = bv;	res.ba[n] = bv;
break;	break;
case BvVec:	case BvVec:
bvp = ber_memalloc_x( sizeof( struct berval ), b->ber->ber_memctx);	bvp = ber_memalloc_x( sizeof( struct berval ),
	ber->ber_memctx );
if ( !bvp ) {	if ( !bvp ) {
LBER_FREE(bv.bv_val);	ber_memfree_x( bv.bv_val, ber->ber_memctx );
goto nomem;	goto failed;
}	}
(*b->res.bv)[n] = bvp;	res.bv[n] = bvp;
*bvp = bv;	*bvp = bv;
break;	break;
case BvOff:	case BvOff:
(BerVarray)((char )(b->res.ba)+nb->siz+b->off) = bv;	(struct berval )(res.bo + tot_size) = bv;
	tot_size += siz;
break;	break;
}	}
}	} while (++n < i);
return tag;	return tag;

nomem:	failed:
if (b->alloc \|\| b->choice == BvVec) {	if (b->choice != BvOff) { /* BvOff does not have LBER_BV_ALLOC set */
for (--n; n>=0; n--) {	while (--n >= 0) {
switch(b->choice) {	switch(b->choice) {
case ChArray:	case ChArray:
LBER_FREE((*b->res.c)[n]);	ber_memfree_x(res.ca[n], ber->ber_memctx);
break;	break;
case BvArray:	case BvArray:
LBER_FREE((*b->res.ba)[n].bv_val);	ber_memfree_x(res.ba[n].bv_val, ber->ber_memctx);
break;	break;
case BvVec:	case BvVec:
LBER_FREE((*b->res.bv)[n]->bv_val);	ber_memfree_x(res.bv[n]->bv_val, ber->ber_memctx);
LBER_FREE((*b->res.bv)[n]);	ber_memfree_x(res.bv[n], ber->ber_memctx);
break;	break;
default:	default:
break;	break;
}	}
}	}
}	}
LBER_FREE(*b->res.c);	ber_memfree_x(b->result, ber->ber_memctx);
*b->res.c = NULL;	b->result = NULL;
return LBER_DEFAULT;	return LBER_DEFAULT;
}	}

Line 486 ber_tag_t	Line 477 ber_tag_t
ber_get_stringbv( BerElement ber, struct berval bv, int option )	ber_get_stringbv( BerElement ber, struct berval bv, int option )
{	{
ber_tag_t tag;	ber_tag_t tag;
	char *data;

assert( ber != NULL );	tag = ber_skip_element( ber, bv );
assert( bv != NULL );	if ( tag == LBER_DEFAULT \|\|
	(( option & LBER_BV_STRING ) &&
assert( LBER_VALID( ber ) );	bv->bv_len && memchr( bv->bv_val, 0, bv->bv_len - 1 )))
	{
if ( (tag = ber_skip_tag( ber, &bv->bv_len )) == LBER_DEFAULT ) {
bv->bv_val = NULL;	bv->bv_val = NULL;
return LBER_DEFAULT;	return LBER_DEFAULT;
}	}

if ( (ber_len_t) ber_pvt_ber_remaining( ber ) < bv->bv_len ) {	data = bv->bv_val;
return LBER_DEFAULT;
}

if ( option & LBER_BV_ALLOC ) {	if ( option & LBER_BV_ALLOC ) {
bv->bv_val = (char *) ber_memalloc_x( bv->bv_len + 1,	bv->bv_val = (char *) ber_memalloc_x( bv->bv_len + 1,
ber->ber_memctx );	ber->ber_memctx );
Line 508 ber_get_stringbv( BerElement *ber, struc	Line 496 ber_get_stringbv( BerElement *ber, struc
return LBER_DEFAULT;	return LBER_DEFAULT;
}	}

if ( bv->bv_len > 0 && (ber_len_t) ber_read( ber, bv->bv_val,	if ( bv->bv_len != 0 ) {
bv->bv_len ) != bv->bv_len )	memcpy( bv->bv_val, data, bv->bv_len );
{
LBER_FREE( bv->bv_val );
bv->bv_val = NULL;
return LBER_DEFAULT;
}	}
} else {	data = bv->bv_val;
bv->bv_val = ber->ber_ptr;
ber->ber_ptr += bv->bv_len;
}	}
ber->ber_tag = (unsigned char )ber->ber_ptr;
if ( !( option & LBER_BV_NOTERM ))	if ( !( option & LBER_BV_NOTERM ))
bv->bv_val[bv->bv_len] = '\0';	data[bv->bv_len] = '\0';

return tag;	return tag;
}	}
Line 530 ber_tag_t	Line 511 ber_tag_t
ber_get_stringbv_null( BerElement ber, struct berval bv, int option )	ber_get_stringbv_null( BerElement ber, struct berval bv, int option )
{	{
ber_tag_t tag;	ber_tag_t tag;
	char *data;

assert( ber != NULL );	tag = ber_skip_element( ber, bv );
assert( bv != NULL );	if ( tag == LBER_DEFAULT \|\| bv->bv_len == 0 ) {

assert( LBER_VALID( ber ) );

if ( (tag = ber_skip_tag( ber, &bv->bv_len )) == LBER_DEFAULT ) {
bv->bv_val = NULL;	bv->bv_val = NULL;
return LBER_DEFAULT;	return tag;
}

if ( (ber_len_t) ber_pvt_ber_remaining( ber ) < bv->bv_len ) {
return LBER_DEFAULT;
}	}

if ( bv->bv_len == 0 ) {	if (( option & LBER_BV_STRING ) &&
	memchr( bv->bv_val, 0, bv->bv_len - 1 ))
	{
bv->bv_val = NULL;	bv->bv_val = NULL;
ber->ber_tag = (unsigned char )ber->ber_ptr;	return LBER_DEFAULT;
return tag;
}	}

	data = bv->bv_val;
if ( option & LBER_BV_ALLOC ) {	if ( option & LBER_BV_ALLOC ) {
bv->bv_val = (char *) ber_memalloc_x( bv->bv_len + 1,	bv->bv_val = (char *) ber_memalloc_x( bv->bv_len + 1,
ber->ber_memctx );	ber->ber_memctx );
Line 558 ber_get_stringbv_null( BerElement *ber,	Line 534 ber_get_stringbv_null( BerElement *ber,
return LBER_DEFAULT;	return LBER_DEFAULT;
}	}

if ( bv->bv_len > 0 && (ber_len_t) ber_read( ber, bv->bv_val,	memcpy( bv->bv_val, data, bv->bv_len );
bv->bv_len ) != bv->bv_len )	data = bv->bv_val;
{
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;
if ( !( option & LBER_BV_NOTERM ))	if ( !( option & LBER_BV_NOTERM ))
bv->bv_val[bv->bv_len] = '\0';	data[bv->bv_len] = '\0';

return tag;	return tag;
}	}
Line 584 ber_get_stringa( BerElement ber, char	Line 551 ber_get_stringa( BerElement ber, char

assert( buf != NULL );	assert( buf != NULL );

tag = ber_get_stringbv( ber, &bv, LBER_BV_ALLOC );	tag = ber_get_stringbv( ber, &bv, LBER_BV_ALLOC \| LBER_BV_STRING );
*buf = bv.bv_val;	*buf = bv.bv_val;

return tag;	return tag;
Line 598 ber_get_stringa_null( BerElement *ber, c	Line 565 ber_get_stringa_null( BerElement *ber, c

assert( buf != NULL );	assert( buf != NULL );

tag = ber_get_stringbv_null( ber, &bv, LBER_BV_ALLOC );	tag = ber_get_stringbv_null( ber, &bv, LBER_BV_ALLOC \| LBER_BV_STRING );
*buf = bv.bv_val;	*buf = bv.bv_val;

return tag;	return tag;
Line 620 ber_get_stringal( BerElement *ber, struc	Line 587 ber_get_stringal( BerElement *ber, struc

tag = ber_get_stringbv( ber, *bv, LBER_BV_ALLOC );	tag = ber_get_stringbv( ber, *bv, LBER_BV_ALLOC );
if ( tag == LBER_DEFAULT ) {	if ( tag == LBER_DEFAULT ) {
LBER_FREE( *bv );	ber_memfree_x( *bv, ber->ber_memctx );
*bv = NULL;	*bv = NULL;
}	}
return tag;	return tag;
Line 632 ber_get_bitstringa(	Line 599 ber_get_bitstringa(
char **buf,	char **buf,
ber_len_t *blen )	ber_len_t *blen )
{	{
ber_len_t datalen;
ber_tag_t tag;	ber_tag_t tag;
	struct berval data;
unsigned char unusedbits;	unsigned char unusedbits;

assert( ber != NULL );
assert( buf != NULL );	assert( buf != NULL );
assert( blen != NULL );	assert( blen != NULL );

assert( LBER_VALID( ber ) );	if ( (tag = ber_skip_element( ber, &data )) == LBER_DEFAULT ) {
	goto fail;
if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) {
*buf = NULL;
return LBER_DEFAULT;
}	}
--datalen;

buf = (char ) ber_memalloc_x( datalen, ber->ber_memctx );	if ( --data.bv_len > (ber_len_t)-1 / 8 ) {
if ( *buf == NULL ) {	goto fail;
return LBER_DEFAULT;	}
	unusedbits = (unsigned char ) data.bv_val++;
	if ( unusedbits > 7 ) {
	goto fail;
}	}

if ( ber_read( ber, (char *)&unusedbits, 1 ) != 1 ) {	if ( memchr( data.bv_val, 0, data.bv_len )) {
LBER_FREE( buf );	goto fail;
*buf = NULL;
return LBER_DEFAULT;
}	}

if ( (ber_len_t) ber_read( ber, *buf, datalen ) != datalen ) {	buf = (char ) ber_memalloc_x( data.bv_len, ber->ber_memctx );
LBER_FREE( buf );	if ( *buf == NULL ) {
*buf = NULL;
return LBER_DEFAULT;	return LBER_DEFAULT;
}	}
ber->ber_tag = (unsigned char )ber->ber_ptr;	memcpy( *buf, data.bv_val, data.bv_len );

blen = datalen 8 - unusedbits;	blen = data.bv_len 8 - unusedbits;
return tag;	return tag;

	fail:
	*buf = NULL;
	return LBER_DEFAULT;
}	}

ber_tag_t	ber_tag_t
ber_get_null( BerElement *ber )	ber_get_null( BerElement *ber )
{	{
ber_len_t len;	ber_len_t len;
ber_tag_t tag;	ber_tag_t tag = ber_skip_tag( ber, &len );

assert( ber != NULL );	return( len == 0 ? tag : LBER_DEFAULT );
assert( LBER_VALID( ber ) );

if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) {
return LBER_DEFAULT;
}

if ( len != 0 ) {
return LBER_DEFAULT;
}
ber->ber_tag = (unsigned char )ber->ber_ptr;

return( tag );
}	}

ber_tag_t	ber_tag_t
Line 696 ber_get_boolean(	Line 650 ber_get_boolean(
BerElement *ber,	BerElement *ber,
ber_int_t *boolval )	ber_int_t *boolval )
{	{
ber_int_t longbool;	return ber_get_int( ber, boolval );
ber_tag_t rc;

assert( ber != NULL );
assert( boolval != NULL );

assert( LBER_VALID( ber ) );

rc = ber_get_int( ber, &longbool );
*boolval = longbool;

return rc;
}	}

ber_tag_t	ber_tag_t
Line 716 ber_first_element(	Line 659 ber_first_element(
ber_len_t *len,	ber_len_t *len,
char **last )	char **last )
{	{
assert( ber != NULL );
assert( len != NULL );
assert( last != NULL );	assert( last != NULL );

/* skip the sequence header, use the len to mark where to stop */	/* skip the sequence header, use the len to mark where to stop */
Line 725 ber_first_element(	Line 666 ber_first_element(
*last = NULL;	*last = NULL;
return LBER_DEFAULT;	return LBER_DEFAULT;
}	}
ber->ber_tag = (unsigned char )ber->ber_ptr;

last = ber->ber_ptr + len;	last = ber->ber_ptr + len;

if ( *last == ber->ber_ptr ) {	if ( *len == 0 ) {
return LBER_DEFAULT;	return LBER_DEFAULT;
}	}

Line 743 ber_next_element(	Line 683 ber_next_element(
LDAP_CONST char *last )	LDAP_CONST char *last )
{	{
assert( ber != NULL );	assert( ber != NULL );
assert( len != NULL );
assert( last != NULL );	assert( last != NULL );

assert( LBER_VALID( ber ) );	assert( LBER_VALID( ber ) );

if ( ber->ber_ptr >= last ) {	if ( ber->ber_ptr >= last ) {
Line 763 ber_scanf ( BerElement *ber,	Line 701 ber_scanf ( BerElement *ber,
{	{
va_list ap;	va_list ap;
LDAP_CONST char *fmt_reset;	LDAP_CONST char *fmt_reset;
char s, *ss;	char s, ss, **sss;
struct berval *bvp, bval;	struct berval data, bval, bvp, **bvpp;
ber_int_t *i;	ber_int_t *i;
ber_len_t *l;	ber_len_t *l;
ber_tag_t *t;	ber_tag_t *t;
Line 775 ber_scanf ( BerElement *ber,	Line 713 ber_scanf ( BerElement *ber,

assert( ber != NULL );	assert( ber != NULL );
assert( fmt != NULL );	assert( fmt != NULL );

assert( LBER_VALID( ber ) );	assert( LBER_VALID( ber ) );

fmt_reset = fmt;	fmt_reset = fmt;
Line 823 ber_scanf ( BerElement *ber,	Line 760 ber_scanf ( BerElement *ber,
break;	break;

case 'e': /* enumerated */	case 'e': /* enumerated */
case 'i': /* int */	case 'i': /* integer */
i = va_arg( ap, ber_int_t * );	i = va_arg( ap, ber_int_t * );
rc = ber_get_int( ber, i );	rc = ber_get_int( ber, i );
break;	break;
Line 844 ber_scanf ( BerElement *ber,	Line 781 ber_scanf ( BerElement *ber,
* len ptr on finish. parsed in-place.	* len ptr on finish. parsed in-place.
*/	*/
{	{
bgbvr cookie = { BvOff };	bgbvr cookie = { BvOff, 0 };
cookie.ber = ber;	bvp = va_arg( ap, struct berval ** );
cookie.res.ba = va_arg( ap, struct berval ** );
cookie.alloc = 0;
l = va_arg( ap, ber_len_t * );	l = va_arg( ap, ber_len_t * );
cookie.siz = *l;	cookie.siz = *l;
cookie.off = va_arg( ap, ber_len_t );	cookie.off = va_arg( ap, ber_len_t );
rc = ber_get_stringbvl( &cookie, l );	rc = ber_get_stringbvl( ber, &cookie );
	*bvp = cookie.result;
	*l = cookie.siz;
break;	break;
}	}

Line 887 ber_scanf ( BerElement *ber,	Line 824 ber_scanf ( BerElement *ber,

case 'v': /* sequence of strings */	case 'v': /* sequence of strings */
{	{
bgbvr cookie = { ChArray };	bgbvr cookie = {
cookie.ber = ber;	ChArray, LBER_BV_ALLOC \| LBER_BV_STRING, sizeof( char * )
cookie.res.c = va_arg( ap, char *** );	};
cookie.alloc = LBER_BV_ALLOC;	rc = ber_get_stringbvl( ber, &cookie );
rc = ber_get_stringbvl( &cookie, NULL );	(va_arg( ap, char ** )) = cookie.result;
break;	break;
}	}

case 'V': /* sequence of strings + lengths */	case 'V': /* sequence of strings + lengths */
{	{
bgbvr cookie = { BvVec };	bgbvr cookie = {
cookie.ber = ber;	BvVec, LBER_BV_ALLOC, sizeof( struct berval * )
cookie.res.bv = va_arg( ap, struct berval *** );	};
cookie.alloc = LBER_BV_ALLOC;	rc = ber_get_stringbvl( ber, &cookie );
rc = ber_get_stringbvl( &cookie, NULL );	(va_arg( ap, struct berval ** )) = cookie.result;
break;	break;
}	}

case 'W': /* bvarray */	case 'W': /* bvarray */
{	{
bgbvr cookie = { BvArray };	bgbvr cookie = {
cookie.ber = ber;	BvArray, LBER_BV_ALLOC, sizeof( struct berval )
cookie.res.ba = va_arg( ap, struct berval ** );	};
cookie.alloc = LBER_BV_ALLOC;	rc = ber_get_stringbvl( ber, &cookie );
rc = ber_get_stringbvl( &cookie, NULL );	(va_arg( ap, struct berval * )) = cookie.result;
break;	break;
}	}

case 'x': /* skip the next element - whatever it is */	case 'x': /* skip the next element - whatever it is */
if ( (rc = ber_skip_tag( ber, &len )) == LBER_DEFAULT )	rc = ber_skip_element( ber, &data );
break;
ber->ber_ptr += len;
ber->ber_tag = (unsigned char )ber->ber_ptr;
break;	break;

case '{': /* begin sequence */	case '{': /* begin sequence */
case '[': /* begin set */	case '[': /* begin set */
if ( (fmt + 1) != 'v' && (fmt + 1) != 'V'	switch ( fmt[1] ) {
&& (fmt + 1) != 'W' && (fmt + 1) != 'M' )	case 'v': case 'V': case 'W': case 'M':
	break;
	default:
rc = ber_skip_tag( ber, &len );	rc = ber_skip_tag( ber, &len );
	break;
	}
break;	break;

case '}': /* end sequence */	case '}': /* end sequence */
Line 944 ber_scanf ( BerElement *ber,	Line 882 ber_scanf ( BerElement *ber,
}	}

va_end( ap );	va_end( ap );

if ( rc == LBER_DEFAULT ) {	if ( rc == LBER_DEFAULT ) {
/*	/*
* Error. Reclaim malloced memory that was given to the caller.	* Error. Reclaim malloced memory that was given to the caller.
Line 966 ber_scanf ( BerElement *ber,	Line 905 ber_scanf ( BerElement *ber,
case 'a': /* octet string - allocate storage as needed */	case 'a': /* octet string - allocate storage as needed */
case 'A':	case 'A':
ss = va_arg( ap, char ** );	ss = va_arg( ap, char ** );
if ( *ss ) {	ber_memfree_x( *ss, ber->ber_memctx );
LBER_FREE( *ss );	*ss = NULL;
*ss = NULL;
}
break;	break;

case 'b': /* boolean */	case 'b': /* boolean */
case 'e': /* enumerated */	case 'e': /* enumerated */
case 'i': /* int */	case 'i': /* integer */
(void) va_arg( ap, int * );	(void) va_arg( ap, ber_int_t * );
break;	break;

case 'l': /* length of next item */	case 'l': /* length of next item */
(void) va_arg( ap, ber_len_t * );	(va_arg( ap, ber_len_t )) = 0;
	break;

	case 'm': /* berval in-place */
	bval = va_arg( ap, struct berval * );
	BER_BVZERO( bval );
	break;

	case 'M': /* BVoff array in-place */
	bvp = va_arg( ap, struct berval ** );
	ber_memfree_x( *bvp, ber->ber_memctx );
	*bvp = NULL;
	(va_arg( ap, ber_len_t )) = 0;
	(void) va_arg( ap, ber_len_t );
break;	break;

case 'o': /* octet string in a supplied berval */	case 'o': /* octet string in a supplied berval */
bval = va_arg( ap, struct berval * );	bval = va_arg( ap, struct berval * );
if ( bval->bv_val != NULL ) {	ber_memfree_x( bval->bv_val, ber->ber_memctx );
LBER_FREE( bval->bv_val );	BER_BVZERO( bval );
bval->bv_val = NULL;
}
bval->bv_len = 0;
break;	break;

case 'O': /* octet string - allocate & include length */	case 'O': /* octet string - allocate & include length */
bvp = va_arg( ap, struct berval ** );	bvp = va_arg( ap, struct berval ** );
if ( *bvp ) {	ber_bvfree_x( *bvp, ber->ber_memctx );
ber_bvfree( *bvp );	*bvp = NULL;
*bvp = NULL;
}
break;	break;

case 's': /* octet string - in a buffer */	case 's': /* octet string - in a buffer */
(void) va_arg( ap, char * );	(void) va_arg( ap, char * );
(void) va_arg( ap, ber_len_t * );	(va_arg( ap, ber_len_t )) = 0;
break;	break;

case 't': /* tag of next item */	case 't': /* tag of next item */
Line 1011 ber_scanf ( BerElement *ber,	Line 956 ber_scanf ( BerElement *ber,

case 'B': /* bit string - allocate storage as needed */	case 'B': /* bit string - allocate storage as needed */
ss = va_arg( ap, char ** );	ss = va_arg( ap, char ** );
if ( *ss ) {	ber_memfree_x( *ss, ber->ber_memctx );
LBER_FREE( *ss );	*ss = NULL;
*ss = NULL;
}
(va_arg( ap, ber_len_t )) = 0; /* for length, in bits */	(va_arg( ap, ber_len_t )) = 0; /* for length, in bits */
break;	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 */
	sss = va_arg( ap, char *** );
	ber_memvfree_x( (void *) sss, ber->ber_memctx );
	*sss = NULL;
	break;

case 'V': /* sequence of strings + lengths */	case 'V': /* sequence of strings + lengths */
	bvpp = va_arg( ap, struct berval *** );
	ber_bvecfree_x( *bvpp, ber->ber_memctx );
	*bvpp = NULL;
	break;

case 'W': /* BerVarray */	case 'W': /* BerVarray */
	bvp = va_arg( ap, struct berval ** );
	ber_bvarray_free_x( *bvp, ber->ber_memctx );
	*bvp = NULL;
	break;

	case 'n': /* null */
case 'x': /* skip the next element - whatever it is */	case 'x': /* skip the next element - whatever it is */
case '{': /* begin sequence */	case '{': /* begin sequence */
case '[': /* begin set */	case '[': /* begin set */

Removed from v.1.105.2.3
changed lines
	Added in v.1.129