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.57 and 1.78

version 1.57, 2000/10/12 19:14:43	version 1.78, 2002/01/06 01:23:36
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.56 2000/10/12 18:02:16 gwilliams Exp $ */	/* $OpenLDAP: pkg/ldap/libraries/liblber/decode.c,v 1.77 2002/01/04 20:17:36 kurt Exp $ */
/*	/*
* Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.	* Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file	* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/	*/
/* Portions	/* Portions
Line 42 ber_get_tag( BerElement *ber )	Line 42 ber_get_tag( BerElement *ber )
unsigned int i;	unsigned int i;

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

if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 ) {	if ( ber_pvt_ber_remaining( ber ) < 1 ) {
return LBER_DEFAULT;	return LBER_DEFAULT;
}	}

	if ( ber->ber_ptr == ber->ber_buf )
	xbyte = *ber->ber_ptr;
	else
	xbyte = ber->ber_tag;
	ber->ber_ptr++;

tag = xbyte;	tag = xbyte;

if ( (xbyte & LBER_BIG_TAG_MASK) != LBER_BIG_TAG_MASK ) {	if ( (xbyte & LBER_BIG_TAG_MASK) != LBER_BIG_TAG_MASK ) {
Line 85 ber_skip_tag( BerElement *ber, ber_len_t	Line 91 ber_skip_tag( BerElement *ber, ber_len_t

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

/*	/*
* Any ber element looks like this: tag length contents.	* Any ber element looks like this: tag length contents.
Line 109 ber_skip_tag( BerElement *ber, ber_len_t	Line 115 ber_skip_tag( BerElement *ber, ber_len_t

/*	/*
* Next, read the length. The first byte contains the length of	* Next, read the length. The first byte contains the length of
* the length. If bit 8 is set, the length is the long form,	* 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	* otherwise it's the short form. We don't allow a length that's
* greater than what we can hold in a ber_len_t.	* greater than what we can hold in a ber_len_t.
*/	*/
Line 137 ber_skip_tag( BerElement *ber, ber_len_t	Line 143 ber_skip_tag( BerElement *ber, ber_len_t
*len = lc;	*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 = *ber->ber_ptr;

return tag;	return tag;
}	}

Line 151 ber_peek_tag(	Line 168 ber_peek_tag(
*/	*/

char *save;	char *save;
ber_tag_t tag;	ber_tag_t tag, old;

	old = ber->ber_tag;
save = ber->ber_ptr;	save = ber->ber_ptr;
tag = ber_skip_tag( ber, len );	tag = ber_skip_tag( ber, len );
ber->ber_ptr = save;	ber->ber_ptr = save;
	ber->ber_tag = old;

return tag;	return tag;
}	}
Line 170 ber_getnint(	Line 189 ber_getnint(

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

/*	/*
* The tag and length have already been stripped off. We should	* The tag and length have already been stripped off. We should
Line 203 ber_getnint(	Line 222 ber_getnint(
} else {	} else {
*num = 0;	*num = 0;
}	}
	ber->ber_tag = *ber->ber_ptr;

return len;	return len;
}	}
Line 216 ber_get_int(	Line 236 ber_get_int(
ber_len_t len;	ber_len_t len;

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

if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) {	if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) {
return LBER_DEFAULT;	return LBER_DEFAULT;
Line 247 ber_get_stringb(	Line 267 ber_get_stringb(
ber_tag_t tag;	ber_tag_t tag;

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

if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) {	if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) {
return LBER_DEFAULT;	return LBER_DEFAULT;
}	}
if ( datalen > (*len - 1) ) {
	/* must fit within allocated space with termination */
	if ( datalen >= *len ) {
return LBER_DEFAULT;	return LBER_DEFAULT;
}	}

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

buf[datalen] = '\0';	buf[datalen] = '\0';

Line 266 ber_get_stringb(	Line 289 ber_get_stringb(
return tag;	return tag;
}	}

	/* Definitions for recursive get_string
	*
	* 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;
	ber_len_t siz;
	ber_len_t off;
	union {
	char ***c;
	BVarray *ba;
	struct berval ***bv;
	} res;
	} bgbvr;

	/* Recursive get_string, for decoding a vector of strings. The number
	* of elements in the vector is limited only by available stack space.
	* Each invocation consumes 24 bytes of stack on a 32-bit machine.
	*/
ber_tag_t	ber_tag_t
ber_get_stringa( BerElement ber, char *buf )	ber_get_stringbvr( bgbvr *b, int n )
	{
	struct berval bv, *bvp = NULL;

	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 ( b->tag == LBER_DEFAULT )
	{
	b->len = n;

	if ( n == 0 ) {
	*b->res.c = NULL;
	return 0;
	}
	/* Allocate the result vector */
	switch (b->choice) {
	case ChArray:
	b->res.c = LBER_MALLOC( (n+1) sizeof( char * ));
	if ( *b->res.c == NULL )
	return LBER_DEFAULT;
	(*b->res.c)[n] = NULL;
	break;
	case BvArray:
	b->res.ba = LBER_MALLOC( (n+1) sizeof( struct berval ));
	if ( *b->res.ba == NULL )
	return LBER_DEFAULT;
	(*b->res.ba)[n].bv_val = NULL;
	break;
	case BvVec:
	b->res.bv = LBER_MALLOC( (n+1) sizeof( struct berval *));
	if ( *b->res.bv == NULL )
	return LBER_DEFAULT;
	(*b->res.bv)[n] = NULL;
	break;
	case BvOff:
	b->res.ba = LBER_MALLOC( (n+1) b->siz );
	if ( *b->res.ba == NULL )
	return LBER_DEFAULT;
	((struct berval )((long)(b->res.ba) + n*b->siz +
	b->off))->bv_val = NULL;
	break;
	}
	return 0;
	}

	/* Do all local allocs before the recursion. Then there
	* cannot possibly be any failures on the return trip.
	*/
	if ( b->choice == BvVec )
	bvp = LBER_MALLOC( sizeof( struct berval ));

	if ( ber_get_stringbv( b->ber, &bv ) == LBER_DEFAULT ) {
	if ( bvp ) LBER_FREE( bvp );
	return LBER_DEFAULT;
	}

	b->tag = ber_get_stringbvr( b, n+1 );

	if ( b->tag == 0 )
	{
	/* store my result */
	switch (b->choice) {
	case ChArray:
	(*b->res.c)[n] = bv.bv_val;
	break;
	case BvArray:
	(*b->res.ba)[n] = bv;
	break;
	case BvVec:
	(*b->res.bv)[n] = bvp;
	*bvp = bv;
	break;
	case BvOff:
	(BVarray)((long)(b->res.ba)+n*b->siz+b->off) = bv;
	}
	} else {
	/* Failure will propagate up and free in reverse
	* order, which is actually ideal.
	*/
	if ( bvp ) LBER_FREE( bvp );
	LBER_FREE( bv.bv_val );
	}
	return b->tag;
	}

	ber_tag_t
	ber_get_stringbv( BerElement ber, struct berval bv )
{	{
ber_len_t datalen;
ber_tag_t tag;	ber_tag_t tag;

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

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

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

if ( (buf = (char ) LBER_MALLOC( datalen + 1 )) == NULL ) {	if ( (bv->bv_val = (char *) LBER_MALLOC( bv->bv_len + 1 )) == NULL ) {
return LBER_DEFAULT;	return LBER_DEFAULT;
}	}

if ( (ber_len_t) ber_read( ber, *buf, datalen ) != datalen ) {	if ( bv->bv_len > 0 && (ber_len_t) ber_read( ber, bv->bv_val,
LBER_FREE( *buf );	bv->bv_len ) != bv->bv_len ) {
*buf = NULL;	LBER_FREE( bv->bv_val );
	bv->bv_val = NULL;
return LBER_DEFAULT;	return LBER_DEFAULT;
}	}
(*buf)[datalen] = '\0';	bv->bv_val[bv->bv_len] = '\0';
	ber->ber_tag = *ber->ber_ptr;

	return tag;
	}

	ber_tag_t
	ber_get_stringa( BerElement ber, char *buf )
	{
	BerValue bv;
	ber_tag_t tag;

	assert( buf != NULL );

	tag = ber_get_stringbv( ber, &bv );
	*buf = bv.bv_val;

return tag;	return tag;
}	}
Line 299 ber_get_stringa( BerElement ber, char	Line 456 ber_get_stringa( BerElement ber, char
ber_tag_t	ber_tag_t
ber_get_stringal( BerElement ber, struct berval *bv )	ber_get_stringal( BerElement ber, struct berval *bv )
{	{
ber_len_t len;
ber_tag_t tag;	ber_tag_t tag;

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

assert( BER_VALID( ber ) );

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

bv = (struct berval ) LBER_MALLOC( sizeof(struct berval) );	bv = (struct berval ) LBER_MALLOC( sizeof(struct berval) );
if ( *bv == NULL ) {	if ( *bv == NULL ) {
return LBER_DEFAULT;	return LBER_DEFAULT;
}	}

if( len == 0 ) {	tag = ber_get_stringbv( ber, *bv );
(*bv)->bv_val = NULL;	if ( tag == LBER_DEFAULT ) {
(*bv)->bv_len = 0;
return tag;
}

(bv)->bv_val = (char ) LBER_MALLOC( len + 1 );
if ( (*bv)->bv_val == NULL ) {
LBER_FREE( *bv );	LBER_FREE( *bv );
*bv = NULL;	*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;	return tag;
}	}

Line 356 ber_get_bitstringa(	Line 488 ber_get_bitstringa(
assert( buf != NULL );	assert( buf != NULL );
assert( blen != NULL );	assert( blen != NULL );

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

if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) {	if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) {
*buf = NULL;	*buf = NULL;
Line 379 ber_get_bitstringa(	Line 511 ber_get_bitstringa(
*buf = NULL;	*buf = NULL;
return LBER_DEFAULT;	return LBER_DEFAULT;
}	}
	ber->ber_tag = *ber->ber_ptr;

blen = datalen 8 - unusedbits;	blen = datalen 8 - unusedbits;
return tag;	return tag;
Line 391 ber_get_null( BerElement *ber )	Line 524 ber_get_null( BerElement *ber )
ber_tag_t tag;	ber_tag_t tag;

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

if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) {	if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) {
return LBER_DEFAULT;	return LBER_DEFAULT;
Line 400 ber_get_null( BerElement *ber )	Line 533 ber_get_null( BerElement *ber )
if ( len != 0 ) {	if ( len != 0 ) {
return LBER_DEFAULT;	return LBER_DEFAULT;
}	}
	ber->ber_tag = *ber->ber_ptr;

return( tag );	return( tag );
}	}
Line 415 ber_get_boolean(	Line 549 ber_get_boolean(
assert( ber != NULL );	assert( ber != NULL );
assert( boolval != NULL );	assert( boolval != NULL );

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

rc = ber_get_int( ber, &longbool );	rc = ber_get_int( ber, &longbool );
*boolval = longbool;	*boolval = longbool;
Line 438 ber_first_element(	Line 572 ber_first_element(
*last = NULL;	*last = NULL;
return LBER_DEFAULT;	return LBER_DEFAULT;
}	}
	ber->ber_tag = *ber->ber_ptr;

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

Line 458 ber_next_element(	Line 593 ber_next_element(
assert( len != NULL );	assert( len != NULL );
assert( last != NULL );	assert( last != NULL );

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

if ( ber->ber_ptr == last ) {	if ( ber->ber_ptr == last ) {
return LBER_DEFAULT;	return LBER_DEFAULT;
Line 475 ber_scanf ( BerElement *ber,	Line 610 ber_scanf ( BerElement *ber,
{	{
va_list ap;	va_list ap;
LDAP_CONST char *fmt_reset;	LDAP_CONST char *fmt_reset;
	char s, *ss;
	#ifdef TMP_SLOTS
char *last;	char *last;
char s, ss, **sss;	char ***sss;
struct berval *bv, bvp, *bval;	ber_tag_t tag;
ber_int_t *i;	struct berval ***bv;
int j;	int j;
	#endif
	struct berval *bvp, bval;
	ber_int_t *i;
ber_len_t *l;	ber_len_t *l;
ber_tag_t *t;	ber_tag_t *t;
ber_tag_t rc, tag;	ber_tag_t rc;
ber_len_t len;	ber_len_t len;

va_start( ap, fmt );	va_start( ap, fmt );
Line 490 ber_scanf ( BerElement *ber,	Line 630 ber_scanf ( BerElement *ber,
assert( ber != NULL );	assert( ber != NULL );
assert( fmt != NULL );	assert( fmt != NULL );

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

fmt_reset = fmt;	fmt_reset = fmt;

LDAP_LOG(( "LIBLBER", LDAP_LEVEL_ENTRY, "ber_scanf fmt (%s) ber:\n", 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_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 );
	#endif

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 547 ber_scanf ( BerElement *ber,	Line 690 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 * );
ber_peek_tag( ber, &bval->bv_len );	rc = ber_get_stringbv( ber, bval );
rc = ber_get_stringa( ber, &bval->bv_val );
break;	break;

case 'O': /* octet string - allocate & include length */	case 'O': /* octet string - allocate & include length */
Line 573 ber_scanf ( BerElement *ber,	Line 715 ber_scanf ( BerElement *ber,
break;	break;

case 'v': /* sequence of strings */	case 'v': /* sequence of strings */
sss = va_arg( ap, char *** );	{
*sss = NULL;	bgbvr cookie = { ber, ChArray };
j = 0;	cookie.res.c = va_arg( ap, char *** );
for ( tag = ber_first_element( ber, &len, &last );	rc = ber_get_stringbvr( &cookie, 0 );
tag != LBER_DEFAULT && rc != LBER_DEFAULT;
tag = ber_next_element( ber, &len, last ) )
{
sss = (char ) LBER_REALLOC( sss,
(j + 2) * sizeof(char *) );

rc = ber_get_stringa( ber, &((*sss)[j]) );
j++;
}
if ( j > 0 )
(*sss)[j] = NULL;
break;	break;
	}

case 'V': /* sequence of strings + lengths */	case 'V': /* sequence of strings + lengths */
bv = va_arg( ap, struct berval *** );	{
*bv = NULL;	bgbvr cookie = { ber, BvVec };
j = 0;	cookie.res.bv = va_arg( ap, struct berval *** );
for ( tag = ber_first_element( ber, &len, &last );	rc = ber_get_stringbvr( &cookie, 0 );
tag != LBER_DEFAULT && rc != LBER_DEFAULT;	break;
tag = ber_next_element( ber, &len, last ) )	}
{
bv = (struct berval ) LBER_REALLOC( bv,	case 'W': /* bvarray */
(j + 2) * sizeof(struct berval *) );	{
	bgbvr cookie = { ber, BvArray };
rc = ber_get_stringal( ber, &((*bv)[j]) );	cookie.res.ba = va_arg( ap, struct berval ** );
j++;	rc = ber_get_stringbvr( &cookie, 0 );
}
if ( j > 0 )
(*bv)[j] = NULL;
break;	break;
	}

	case 'w': /* bvoffarray - must include address of
	* a record len, and record offset.
	* number of records will be returned thru
	* len ptr on finish.
	*/
	{
	bgbvr cookie = { ber, BvOff };
	cookie.res.ba = va_arg( ap, struct berval ** );
	l = va_arg( ap, ber_len_t * );
	cookie.siz = *l;
	cookie.off = va_arg( ap, ber_len_t );
	rc = ber_get_stringbvr( &cookie, 0 );
	*l = cookie.len;
	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 )	if ( (rc = ber_skip_tag( ber, &len )) == LBER_DEFAULT )
break;	break;
ber->ber_ptr += len;	ber->ber_ptr += len;
	ber->ber_tag = *ber->ber_ptr;
break;	break;

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

Line 626 ber_scanf ( BerElement *ber,	Line 774 ber_scanf ( BerElement *ber,

default:	default:
if( ber->ber_debug ) {	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_log_printf( LDAP_DEBUG_ANY, ber->ber_debug,
"ber_scanf: unknown fmt %c\n", *fmt );	"ber_scanf: unknown fmt %c\n", *fmt );
	#endif
}	}
rc = LBER_DEFAULT;	rc = LBER_DEFAULT;
break;	break;
Line 635 ber_scanf ( BerElement *ber,	Line 788 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 710 ber_scanf ( BerElement *ber,	Line 862 ber_scanf ( BerElement *ber,
break;	break;

case 'v': /* sequence of strings */	case 'v': /* sequence of strings */
sss = va_arg( ap, char *** );
if ( *sss ) {
for (j = 0; (*sss)[j]; j++) {
LBER_FREE( (*sss)[j] );
(*sss)[j] = NULL;
}
LBER_FREE( *sss );
*sss = NULL;
}
break;

case 'V': /* sequence of strings + lengths */	case 'V': /* sequence of strings + lengths */
bv = va_arg( ap, struct berval *** );	case 'W': /* BVarray */
if ( *bv ) {
ber_bvecfree( *bv );
*bv = NULL;
}
break;

case 'n': /* null */	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 */

Removed from v.1.57
changed lines
	Added in v.1.78