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.63 and 1.68

version 1.63, 2001/11/04 16:50:16	version 1.68, 2001/12/31 13:45:49
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.62 2001/11/03 21:07:41 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/libraries/liblber/decode.c,v 1.67 2001/12/17 21:42:55 hyc 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 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 */	/* BER element should have enough data left */
if( *len > ber_pvt_ber_remaining( ber ) ) {	if( *len > (ber_len_t) ber_pvt_ber_remaining( ber ) ) {
return LBER_DEFAULT;	return LBER_DEFAULT;
}	}

Line 274 ber_get_stringb(	Line 279 ber_get_stringb(
}	}

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( LBER_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 306 ber_get_stringa( BerElement ber, char	Line 325 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( LBER_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 474 ber_next_element(	Line 468 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 557 ber_scanf ( BerElement *ber,	Line 554 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 583 ber_scanf ( BerElement *ber,	Line 579 ber_scanf ( BerElement *ber,
break;	break;

case 'v': /* sequence of strings */	case 'v': /* sequence of strings */
	{
	char *tmp[TMP_SLOTS];
sss = va_arg( ap, char *** );	sss = va_arg( ap, char *** );
*sss = NULL;	*sss = NULL;
j = 0;	j = 0;
Line 590 ber_scanf ( BerElement *ber,	Line 588 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 ) )
{	{
void save = sss;	rc = ber_get_stringa( ber, &tmp[j] );
	j++;
sss = (char ) LBER_REALLOC( sss,	assert(j < TMP_SLOTS);
(j + 2) * sizeof(char *) );	}
	if (j > 0 && rc != LBER_DEFAULT ) {
if( *sss == NULL ) {	sss = (char )LBER_MALLOC( (j+1) sizeof(char *));
LBER_FREE( save );	if (*sss == NULL) {
rc = LBER_DEFAULT;	rc = LBER_DEFAULT;
goto breakout;	} else {
	(*sss)[j] = NULL;
	for (j--; j>=0; j--)
	(*sss)[j] = tmp[j];
}	}

rc = ber_get_stringa( ber, &((*sss)[j]) );
j++;
}	}
if ( j > 0 )	if ( rc == LBER_DEFAULT ) {
(*sss)[j] = NULL;	for (j--; j>=0; j--)
	LBER_FREE(tmp[j]);
	}
break;	break;
	}

case 'V': /* sequence of strings + lengths */	case 'V': /* sequence of strings + lengths */
	{
	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 616 ber_scanf ( BerElement *ber,	Line 619 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 ) )
{	{
void save = bv;	rc = ber_get_stringal( ber, &tmp[j] );
	j++;
bv = (struct berval ) LBER_REALLOC( bv,	assert( j < TMP_SLOTS);
(j + 2) * sizeof(struct berval *) );	}
	if (j > 0 && rc != LBER_DEFAULT ) {
if( *bv == NULL ) {	bv = (struct berval )LBER_MALLOC( (j+1) sizeof(struct berval *));
LBER_FREE( save );	if (*bv == NULL) {
rc = LBER_DEFAULT;	rc = LBER_DEFAULT;
goto breakout;	} 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]);
	}
	break;
	}

rc = ber_get_stringal( ber, &((*bv)[j]) );	case 'W': /* bvarray */
	{
	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 )
(*bv)[j] = NULL;
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 742 breakout:	Line 780 breakout:
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.63
changed lines
	Added in v.1.68