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.12 and 1.106

version 1.105.2.12, 2011/01/04 23:49:58	version 1.106, 2007/01/02 19:00:57
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.11 2010/04/13 20:22:53 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/libraries/liblber/decode.c,v 1.105 2006/02/14 22:18:12 kurt 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-2011 The OpenLDAP Foundation.	* Copyright 1998-2007 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 */	/* return the tag - LBER_DEFAULT returned means trouble */
int	ber_tag_t
ber_decode_oid( BerValue in, BerValue out )	ber_get_tag( BerElement *ber )
{
const unsigned char *der;
unsigned long val;
unsigned val1;
ber_len_t i;
char *ptr;

assert( in != NULL );
assert( out != NULL );

/* need 4 chars/inbyte + \0 for input={7f 7f 7f...} */
if ( !out->bv_val \|\| (out->bv_len+3)/4 <= in->bv_len )
return -1;

ptr = NULL;
der = (unsigned char *) in->bv_val;
val = 0;
for ( i=0; i < in->bv_len; i++ ) {
val \|= der[i] & 0x7f;
if ( !( der[i] & 0x80 )) {
if ( ptr == NULL ) {
/* Initial "x.y": val=x40+y, x<=2, y<40 if x<2 /
ptr = out->bv_val;
val1 = (val < 80 ? val/40 : 2);
val -= val1*40;
ptr += sprintf( ptr, "%u", val1 );
}
ptr += sprintf( ptr, ".%lu", val );
val = 0;
} else if ( val - 1UL < LBER_OID_COMPONENT_MAX >> 7 ) {
val <<= 7;
} else {
/* val would overflow, or is 0 from invalid initial 0x80 octet */
return -1;
}
}
if ( ptr == NULL \|\| val != 0 )
return -1;

out->bv_len = ptr - out->bv_val;
return 0;
}

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

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

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

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

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

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

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

fail:
/* Error or unsupported tag size */
tag = LBER_DEFAULT;

done:
bv->bv_len = rest;
bv->bv_val = (char *) ptr;
return tag;
}

/* Return the tag - LBER_DEFAULT returned means trouble */	/* tag too big! */
ber_tag_t	if ( i == sizeof(ber_tag_t) ) {
ber_get_tag( BerElement *ber )	return LBER_DEFAULT;
{	}
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_peek_element( const BerElement ber, struct berval bv )	ber_skip_tag( BerElement ber, ber_len_t len )
{	{
ber_tag_t tag;	ber_tag_t tag;
ber_len_t len, rest;	unsigned char lc;
unsigned i;	ber_len_t i, noctets;
unsigned char *ptr;	unsigned char netlen[sizeof(ber_len_t)];

assert( bv != NULL );	assert( ber != 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, and point	* Assuming everything's ok, we return the tag byte (we
* bv at the contents.	* can assume a single byte), and return the length in len.
*	*
* 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 );

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

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

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

	if ( lc & 0x80U ) {
	noctets = (lc & 0x7fU);

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

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

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

bv->bv_len = len;	for( i = 0; i < noctets; i++ ) {
bv->bv_val = (char *) ptr;	*len <<= 8;
return tag;	*len \|= netlen[i];
}	}

/* Move past next element, point *bv at it in-place, and return its tag.	} else {
* The caller may \0-terminate *bv, as next octet is saved in ber->ber_tag.	*len = lc;
* 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 element should have enough data left */
ber->ber_ptr = bv->bv_val + bv->bv_len;	if( *len > (ber_len_t) ber_pvt_ber_remaining( ber ) ) {
ber->ber_tag = (unsigned char ) ber->ber_ptr;	return LBER_DEFAULT;
}	}
	ber->ber_tag = (unsigned char )ber->ber_ptr;

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

ber_tag_t	char *save;
ber_skip_tag( BerElement ber, ber_len_t lenp )	ber_tag_t tag, old;
{
struct berval bv;
ber_tag_t tag = ber_peek_element( ber, &bv );

ber->ber_ptr = bv.bv_val;	old = ber->ber_tag;
ber->ber_tag = (unsigned char ) ber->ber_ptr;	save = ber->ber_ptr;
	tag = ber_skip_tag( ber, len );
	ber->ber_ptr = save;
	ber->ber_tag = old;

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

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

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

tag = ber_skip_element( ber, &bv );	/*
len = bv.bv_len;	* The tag and length have already been stripped off. We should
if ( tag == LBER_DEFAULT \|\| len > sizeof(ber_int_t) ) {	* be sitting right before len bytes of 2's complement integer,
return LBER_DEFAULT;	* 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) ) {
	return -1;
	}

	/* 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 ) {
unsigned char buf = (unsigned char ) bv.bv_val;	/* sign extend if necessary */
ber_len_t i;	ber_len_t i;
ber_int_t netnum = buf[0] & 0xff;	ber_int_t netnum = 0x80 & buf[0] ? -1 : 0;

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

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

Line 295 ber_get_int(	Line 229 ber_get_int(
} 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 313 ber_get_stringb(	Line 270 ber_get_stringb(
char *buf,	char *buf,
ber_len_t *len )	ber_len_t *len )
{	{
struct berval bv;	ber_len_t datalen;
ber_tag_t tag;	ber_tag_t tag;

if ( (tag = ber_skip_element( ber, &bv )) == LBER_DEFAULT ) {	assert( ber != NULL );
	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 ( bv.bv_len >= *len ) {	if ( datalen >= *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;

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

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

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

static ber_tag_t	static ber_tag_t
ber_get_stringbvl( BerElement ber, bgbvr b )	ber_get_stringbvl( bgbvr b, ber_len_t rlen )
{	{
int i = 0, n;	int i = 0, n;
ber_tag_t tag;	ber_tag_t tag;
ber_len_t tot_size = 0, siz = b->siz;	ber_len_t len;
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 );

if ( tag != LBER_DEFAULT ) {	/* For rewinding, just like ber_peek_tag() */
tag = 0;	orig = b->ber->ber_ptr;
orig = ber->ber_ptr;	tag = b->ber->ber_tag;
last = orig + bv.bv_len;

for ( ; ber->ber_ptr < last; i++, tot_size += siz ) {	if ( ber_first_element( b->ber, &len, &last ) != LBER_DEFAULT ) {
if ( ber_skip_element( ber, &bv ) == LBER_DEFAULT )	for ( ; b->ber->ber_ptr < last; i++ ) {
break;	if (ber_skip_tag( b->ber, &len ) == LBER_DEFAULT) break;
}	b->ber->ber_ptr += len;
if ( ber->ber_ptr != last ) {	b->ber->ber_tag = (unsigned char )b->ber->ber_ptr;
i = 0;
tag = LBER_DEFAULT;
}	}

ber->ber_ptr = orig;
ber->ber_tag = (unsigned char ) orig;
}	}

b->siz = i;	if ( rlen ) *rlen = i;

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

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

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

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

tag = ber_skip_element( ber, bv );	assert( ber != NULL );
if ( tag == LBER_DEFAULT \|\|	assert( bv != NULL );
(( option & LBER_BV_STRING ) &&
bv->bv_len && memchr( bv->bv_val, 0, bv->bv_len - 1 )))	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 LBER_DEFAULT;
}	}

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

	if ( 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 );
if ( bv->bv_val == NULL ) {	if ( bv->bv_val == NULL ) {
return LBER_DEFAULT;	return LBER_DEFAULT;
}	}

if ( bv->bv_len != 0 ) {	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 )
	{
	LBER_FREE( bv->bv_val );
	bv->bv_val = NULL;
	return LBER_DEFAULT;
}	}
data = bv->bv_val;	} else {
	bv->bv_val = ber->ber_ptr;
	ber->ber_ptr += bv->bv_len;
}	}
if ( !( option & LBER_BV_NOTERM ))	ber->ber_tag = (unsigned char )ber->ber_ptr;
data[bv->bv_len] = '\0';	bv->bv_val[bv->bv_len] = '\0';

return tag;	return tag;
}	}

ber_tag_t	ber_tag_t
ber_get_stringbv_null( BerElement ber, struct berval bv, int option )	ber_get_stringbv_null( BerElement ber, struct berval bv, int alloc )
{	{
ber_tag_t tag;	ber_tag_t tag;
char *data;

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

	assert( LBER_VALID( ber ) );

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

if (( option & LBER_BV_STRING ) &&	if ( (ber_len_t) ber_pvt_ber_remaining( ber ) < bv->bv_len ) {
memchr( bv->bv_val, 0, bv->bv_len - 1 ))
{
bv->bv_val = NULL;
return LBER_DEFAULT;	return LBER_DEFAULT;
}	}

data = bv->bv_val;	if ( bv->bv_len == 0 ) {
if ( option & LBER_BV_ALLOC ) {	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,	bv->bv_val = (char *) ber_memalloc_x( bv->bv_len + 1,
ber->ber_memctx );	ber->ber_memctx );
if ( bv->bv_val == NULL ) {	if ( bv->bv_val == NULL ) {
return LBER_DEFAULT;	return LBER_DEFAULT;
}	}

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

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

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

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

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

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

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

return tag;	return tag;
Line 585 ber_get_stringal( BerElement *ber, struc	Line 570 ber_get_stringal( BerElement *ber, struc
return LBER_DEFAULT;	return LBER_DEFAULT;
}	}

tag = ber_get_stringbv( ber, *bv, LBER_BV_ALLOC );	tag = ber_get_stringbv( ber, *bv, 1 );
if ( tag == LBER_DEFAULT ) {	if ( tag == LBER_DEFAULT ) {
ber_memfree_x( *bv, ber->ber_memctx );	LBER_FREE( *bv );
*bv = NULL;	*bv = NULL;
}	}
return tag;	return tag;
Line 599 ber_get_bitstringa(	Line 584 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 );

if ( (tag = ber_skip_element( ber, &data )) == LBER_DEFAULT ) {	assert( LBER_VALID( ber ) );
goto fail;
}

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

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

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

blen = data.bv_len 8 - unusedbits;	blen = datalen 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_skip_tag( ber, &len );	ber_tag_t tag;

return( len == 0 ? tag : LBER_DEFAULT );	assert( ber != NULL );
	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 650 ber_get_boolean(	Line 648 ber_get_boolean(
BerElement *ber,	BerElement *ber,
ber_int_t *boolval )	ber_int_t *boolval )
{	{
return ber_get_int( ber, boolval );	ber_int_t longbool;
	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 659 ber_first_element(	Line 668 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 666 ber_first_element(	Line 677 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 ( *len == 0 ) {	if ( *last == ber->ber_ptr ) {
return LBER_DEFAULT;	return LBER_DEFAULT;
}	}

Line 683 ber_next_element(	Line 695 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 701 ber_scanf ( BerElement *ber,	Line 715 ber_scanf ( BerElement *ber,
{	{
va_list ap;	va_list ap;
LDAP_CONST char *fmt_reset;	LDAP_CONST char *fmt_reset;
char s, ss, **sss;	char s, *ss;
struct berval data, bval, bvp, **bvpp;	struct berval *bvp, bval;
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 713 ber_scanf ( BerElement *ber,	Line 727 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;

if ( ber->ber_debug & (LDAP_DEBUG_TRACE\|LDAP_DEBUG_BER)) {	ber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug,
ber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug,	"ber_scanf fmt (%s) ber:\n", fmt );
"ber_scanf fmt (%s) ber:\n", fmt );	ber_log_dump( LDAP_DEBUG_BER, ber->ber_debug, ber, 1 );
ber_log_dump( LDAP_DEBUG_BER, ber->ber_debug, ber, 1 );
}

for ( rc = 0; *fmt && rc != LBER_DEFAULT; fmt++ ) {	for ( rc = 0; *fmt && rc != LBER_DEFAULT; fmt++ ) {
/* When this is modified, remember to update	/* When this is modified, remember to update
Line 760 ber_scanf ( BerElement *ber,	Line 773 ber_scanf ( BerElement *ber,
break;	break;

case 'e': /* enumerated */	case 'e': /* enumerated */
case 'i': /* integer */	case 'i': /* int */
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 781 ber_scanf ( BerElement *ber,	Line 794 ber_scanf ( BerElement *ber,
* len ptr on finish. parsed in-place.	* len ptr on finish. parsed in-place.
*/	*/
{	{
bgbvr cookie = { BvOff, 0 };	bgbvr cookie = { BvOff };
bvp = va_arg( ap, struct berval ** );	cookie.ber = ber;
	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( ber, &cookie );	rc = ber_get_stringbvl( &cookie, l );
*bvp = cookie.result;
*l = cookie.siz;
break;	break;
}	}

Line 798 ber_scanf ( BerElement *ber,	Line 811 ber_scanf ( BerElement *ber,

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 * );
rc = ber_get_stringbv( ber, bval, LBER_BV_ALLOC );	rc = ber_get_stringbv( ber, bval, 1 );
break;	break;

case 'O': /* octet string - allocate & include length */	case 'O': /* octet string - allocate & include length */
Line 824 ber_scanf ( BerElement *ber,	Line 837 ber_scanf ( BerElement *ber,

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

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

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

case 'x': /* skip the next element - whatever it is */	case 'x': /* skip the next element - whatever it is */
rc = ber_skip_element( ber, &data );	if ( (rc = ber_skip_tag( ber, &len )) == LBER_DEFAULT )
	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 */
switch ( fmt[1] ) {	if ( (fmt + 1) != 'v' && (fmt + 1) != 'V'
case 'v': case 'V': case 'W': case 'M':	&& (fmt + 1) != 'W' && (fmt + 1) != '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 882 ber_scanf ( BerElement *ber,	Line 894 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 905 ber_scanf ( BerElement *ber,	Line 916 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 ** );
ber_memfree_x( *ss, ber->ber_memctx );	if ( *ss ) {
*ss = NULL;	LBER_FREE( *ss );
	*ss = NULL;
	}
break;	break;

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

case 'l': /* length of next item */	case 'l': /* length of next item */
(va_arg( ap, ber_len_t )) = 0;	(void) va_arg( ap, ber_len_t * );
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 * );
ber_memfree_x( bval->bv_val, ber->ber_memctx );	if ( bval->bv_val != NULL ) {
BER_BVZERO( bval );	LBER_FREE( bval->bv_val );
	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 ** );
ber_bvfree_x( *bvp, ber->ber_memctx );	if ( *bvp ) {
*bvp = NULL;	ber_bvfree( *bvp );
	*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 * );
(va_arg( ap, ber_len_t )) = 0;	(void) va_arg( ap, ber_len_t * );
break;	break;

case 't': /* tag of next item */	case 't': /* tag of next item */
Line 956 ber_scanf ( BerElement *ber,	Line 961 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 ** );
ber_memfree_x( *ss, ber->ber_memctx );	if ( *ss ) {
*ss = NULL;	LBER_FREE( *ss );
	*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.12
changed lines
	Added in v.1.106