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.56 and 1.71

version 1.56, 2000/10/12 18:02:16	version 1.71, 2002/01/03 01:53:41
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.55 2000/10/11 00:43:14 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/libraries/liblber/decode.c,v 1.70 2002/01/02 16:06:56 kurt Exp $ */
/*	/*
* Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.	* Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file	* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
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_read( ber, (char *) &xbyte, 1 ) != 1 ) {
return LBER_DEFAULT;	return LBER_DEFAULT;
Line 85 ber_skip_tag( BerElement *ber, ber_len_t	Line 85 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 109 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 137 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;
	}

return tag;	return tag;
}	}

Line 170 ber_getnint(	Line 180 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 216 ber_get_int(	Line 226 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 257 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;
}	}

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

	enum bgbvc { ChArray, BvArray, BvVec };

	typedef struct bgbvr {
	BerElement *ber;
	enum bgbvc choice;
	ber_tag_t tag;
	ber_len_t len;
	char *last;
	union {
	char ***c;
	BVarray *ba;
	struct berval ***bv;
	} res;
	} bgbvr;

	ber_tag_t
	ber_get_stringbvr( bgbvr *b, int n )
	{
	struct berval bv;

	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 )
	{
	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;
	}
	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 )
	{
	/* 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] = ber_bvdup( &bv );
	break;
	}
	} else {
	LBER_FREE( bv.bv_val );
	}
	return b->tag;
	}

ber_tag_t	ber_tag_t
ber_get_stringa( BerElement ber, char *buf )	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';

	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 398 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 430 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 391 ber_get_null( BerElement *ber )	Line 465 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 415 ber_get_boolean(	Line 489 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 458 ber_next_element(	Line 532 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 467 ber_next_element(	Line 541 ber_next_element(
return ber_peek_tag( ber, len );	return ber_peek_tag( ber, len );
}	}

	/* Hopefully no one sends vectors with more elements than this */
	/* #define TMP_SLOTS 1024 */

/* VARARGS */	/* VARARGS */
ber_tag_t	ber_tag_t
ber_scanf ( BerElement *ber,	ber_scanf ( BerElement *ber,
Line 477 ber_scanf ( BerElement *ber,	Line 554 ber_scanf ( BerElement *ber,
LDAP_CONST char *fmt_reset;	LDAP_CONST char *fmt_reset;
char *last;	char *last;
char s, ss, **sss;	char s, ss, **sss;
struct berval *bv, bvp, *bval;	struct berval *bv, bvp, *bval;
ber_int_t *i;	ber_int_t *i;
int j;	int j;
ber_len_t *l;	ber_len_t *l;
Line 490 ber_scanf ( BerElement *ber,	Line 567 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 627 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 652 ber_scanf ( BerElement *ber,
break;	break;

case 'v': /* sequence of strings */	case 'v': /* sequence of strings */
	{
	#ifdef TMP_SLOTS
	char *tmp[TMP_SLOTS];
sss = va_arg( ap, char *** );	sss = va_arg( ap, char *** );
*sss = NULL;	*sss = NULL;
j = 0;	j = 0;
Line 580 ber_scanf ( BerElement *ber,	Line 662 ber_scanf ( BerElement *ber,
tag != LBER_DEFAULT && rc != LBER_DEFAULT;	tag != LBER_DEFAULT && rc != LBER_DEFAULT;
tag = ber_next_element( ber, &len, last ) )	tag = ber_next_element( ber, &len, last ) )
{	{
sss = (char ) LBER_REALLOC( sss,	rc = ber_get_stringa( ber, &tmp[j] );
(j + 2) * sizeof(char *) );

rc = ber_get_stringa( ber, &((*sss)[j]) );
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]);
}	}
if ( j > 0 )	#else
(*sss)[j] = NULL;	bgbvr cookie = { ber, ChArray };
	cookie.res.c = va_arg( ap, char *** );
	rc = ber_get_stringbvr( &cookie, 0 );
	#endif
break;	break;
	}

case 'V': /* sequence of strings + lengths */	case 'V': /* sequence of strings + lengths */
	{
	#ifdef TMP_SLOTS
	struct berval *tmp[TMP_SLOTS];
bv = va_arg( ap, struct berval *** );	bv = va_arg( ap, struct berval *** );
*bv = NULL;	*bv = NULL;
j = 0;	j = 0;
Line 598 ber_scanf ( BerElement *ber,	Line 699 ber_scanf ( BerElement *ber,
tag != LBER_DEFAULT && rc != LBER_DEFAULT;	tag != LBER_DEFAULT && rc != LBER_DEFAULT;
tag = ber_next_element( ber, &len, last ) )	tag = ber_next_element( ber, &len, last ) )
{	{
bv = (struct berval ) LBER_REALLOC( bv,	rc = ber_get_stringal( ber, &tmp[j] );
(j + 2) * sizeof(struct berval *) );	j++;
	assert( j < TMP_SLOTS);
rc = ber_get_stringal( ber, &((*bv)[j]) );	}
	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 };
	cookie.res.bv = va_arg( ap, struct berval *** );
	rc = ber_get_stringbvr( &cookie, 0 );
	#endif
	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++;	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);
}	}
if ( j > 0 )	#else
(*bv)[j] = NULL;	bgbvr cookie = { ber, BvArray };
	cookie.res.ba = va_arg( ap, struct berval ** );
	rc = ber_get_stringbvr( &cookie, 0 );
	#endif
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 )	if ( (rc = ber_skip_tag( ber, &len )) == LBER_DEFAULT )
Line 616 ber_scanf ( BerElement *ber,	Line 771 ber_scanf ( BerElement *ber,

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' )
rc = ber_skip_tag( ber, &len );	rc = ber_skip_tag( ber, &len );
break;	break;

Line 626 ber_scanf ( BerElement *ber,	Line 782 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 796 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 870 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.56
changed lines
	Added in v.1.71