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.34.6.5 and 1.34.6.6

version 1.34.6.5, 2000/10/02 17:26:31	version 1.34.6.6, 2000/10/12 19:52:39
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.34.6.4 2000/07/29 01:53:07 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/libraries/liblber/decode.c,v 1.34.6.5 2000/10/02 17:26:31 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 44 ber_get_tag( BerElement *ber )	Line 44 ber_get_tag( BerElement *ber )
assert( ber != NULL );	assert( ber != NULL );
assert( BER_VALID( ber ) );	assert( BER_VALID( ber ) );

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

tag = xbyte;	tag = xbyte;

if ( (xbyte & LBER_BIG_TAG_MASK) != LBER_BIG_TAG_MASK )	if ( (xbyte & LBER_BIG_TAG_MASK) != LBER_BIG_TAG_MASK ) {
return tag;	return tag;
	}

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

tag <<= 8;	tag <<= 8;
tag \|= 0x00ffUL & (ber_tag_t) xbyte;	tag \|= 0x00ffUL & (ber_tag_t) xbyte;

if ( ! (xbyte & LBER_MORE_TAG_MASK) )	if ( ! (xbyte & LBER_MORE_TAG_MASK) ) {
break;	break;
	}
}	}

/* tag too big! */	/* tag too big! */
if ( i == sizeof(ber_tag_t) )	if ( i == sizeof(ber_tag_t) ) {
return( LBER_DEFAULT );	return LBER_DEFAULT;
	}

return tag;	return tag;
}	}
Line 98 ber_skip_tag( BerElement *ber, ber_len_t	Line 103 ber_skip_tag( BerElement *ber, ber_len_t
* First, we read the tag.	* First, we read the tag.
*/	*/

if ( (tag = ber_get_tag( ber )) == LBER_DEFAULT )	if ( (tag = ber_get_tag( ber )) == LBER_DEFAULT ) {
return( LBER_DEFAULT );	return LBER_DEFAULT;
	}

/*	/*
* Next, read the length. The first byte contains the length of	* Next, read the length. The first byte contains the length of
Line 109 ber_skip_tag( BerElement *ber, ber_len_t	Line 115 ber_skip_tag( BerElement *ber, ber_len_t
*/	*/

if ( ber_read( ber, (char *) &lc, 1 ) != 1 )	if ( ber_read( ber, (char *) &lc, 1 ) != 1 )
return( LBER_DEFAULT );	return LBER_DEFAULT;

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

if ( noctets > sizeof(ber_len_t) ) {	if ( noctets > sizeof(ber_len_t) ) {
return( LBER_DEFAULT );	return LBER_DEFAULT;
}	}

if( (unsigned) ber_read( ber, netlen, noctets ) != noctets ) {	if( (unsigned) ber_read( ber, netlen, noctets ) != noctets ) {
return( LBER_DEFAULT );	return LBER_DEFAULT;
}	}

for( i = 0; i < noctets; i++ ) {	for( i = 0; i < noctets; i++ ) {
Line 131 ber_skip_tag( BerElement *ber, ber_len_t	Line 137 ber_skip_tag( BerElement *ber, ber_len_t
*len = lc;	*len = lc;
}	}

return( tag );	return tag;
}	}

ber_tag_t	ber_tag_t
Line 164 ber_getnint(	Line 170 ber_getnint(

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

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

/*	/*
Line 174 ber_getnint(	Line 179 ber_getnint(
* extend after we read it in.	* extend after we read it in.
*/	*/

if ( len > sizeof(ber_int_t) )	if ( len > sizeof(ber_int_t) ) {
return( -1 );	return -1;
	}

/* read into the low-order bytes of our buffer */	/* read into the low-order bytes of our buffer */
if ( (ber_len_t) ber_read( ber, (char *) buf, len ) != len ) {	if ( (ber_len_t) ber_read( ber, (char *) buf, len ) != len ) {
return( -1 );	return -1;
}	}

if( len ) {	if( len ) {
Line 198 ber_getnint(	Line 204 ber_getnint(
*num = 0;	*num = 0;
}	}

return( len );	return len;
}	}

ber_tag_t	ber_tag_t
Line 212 ber_get_int(	Line 218 ber_get_int(
assert( ber != NULL );	assert( ber != NULL );
assert( BER_VALID( ber ) );	assert( BER_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;
	}

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

ber_tag_t	ber_tag_t
Line 241 ber_get_stringb(	Line 249 ber_get_stringb(
assert( ber != NULL );	assert( ber != NULL );
assert( BER_VALID( ber ) );	assert( BER_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) )	}
return( LBER_DEFAULT );	if ( datalen > (*len - 1) ) {
	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;
	}

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

*len = datalen;	*len = datalen;
return( tag );	return tag;
}	}

ber_tag_t	ber_tag_t
Line 268 ber_get_stringa( BerElement ber, char	Line 279 ber_get_stringa( BerElement ber, char

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

if ( (buf = (char ) LBER_MALLOC( datalen + 1 )) == NULL )	if ( (buf = (char ) LBER_MALLOC( datalen + 1 )) == NULL ) {
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 ) {
LBER_FREE( *buf );	LBER_FREE( *buf );
*buf = NULL;	*buf = NULL;
return( LBER_DEFAULT );	return LBER_DEFAULT;
}	}
(*buf)[datalen] = '\0';	(*buf)[datalen] = '\0';

return( tag );	return tag;
}	}

ber_tag_t	ber_tag_t
Line 327 ber_get_stringal( BerElement *ber, struc	Line 339 ber_get_stringal( BerElement *ber, struc
((*bv)->bv_val)[len] = '\0';	((*bv)->bv_val)[len] = '\0';
(*bv)->bv_len = len;	(*bv)->bv_len = len;

return( tag );	return tag;
}	}

ber_tag_t	ber_tag_t
Line 348 ber_get_bitstringa(	Line 360 ber_get_bitstringa(

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

if ( (buf = (char ) LBER_MALLOC( datalen )) == NULL )	if ( (buf = (char ) LBER_MALLOC( datalen )) == NULL ) {
return( LBER_DEFAULT );	return LBER_DEFAULT;
	}

if ( ber_read( ber, (char *)&unusedbits, 1 ) != 1 ) {	if ( ber_read( ber, (char *)&unusedbits, 1 ) != 1 ) {
LBER_FREE( buf );	LBER_FREE( buf );
*buf = NULL;	*buf = NULL;
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 ) {
LBER_FREE( buf );	LBER_FREE( buf );
*buf = NULL;	*buf = NULL;
return( LBER_DEFAULT );	return LBER_DEFAULT;
}	}

blen = datalen 8 - unusedbits;	blen = datalen 8 - unusedbits;
return( tag );	return tag;
}	}

ber_tag_t	ber_tag_t
Line 380 ber_get_null( BerElement *ber )	Line 393 ber_get_null( BerElement *ber )
assert( ber != NULL );	assert( ber != NULL );
assert( BER_VALID( ber ) );	assert( BER_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;
	}

if ( len != 0 )	if ( len != 0 ) {
return( LBER_DEFAULT );	return LBER_DEFAULT;
	}

return( tag );	return( tag );
}	}
Line 405 ber_get_boolean(	Line 420 ber_get_boolean(
rc = ber_get_int( ber, &longbool );	rc = ber_get_int( ber, &longbool );
*boolval = longbool;	*boolval = longbool;

return( rc );	return rc;
}	}

ber_tag_t	ber_tag_t
Line 421 ber_first_element(	Line 436 ber_first_element(
/* skip the sequence header, use the len to mark where to stop */	/* skip the sequence header, use the len to mark where to stop */
if ( ber_skip_tag( ber, len ) == LBER_DEFAULT ) {	if ( ber_skip_tag( ber, len ) == LBER_DEFAULT ) {
*last = NULL;	*last = NULL;
return( LBER_DEFAULT );	return LBER_DEFAULT;
}	}

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

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

return( ber_peek_tag( ber, len ) );	return ber_peek_tag( ber, len );
}	}

ber_tag_t	ber_tag_t
Line 446 ber_next_element(	Line 461 ber_next_element(
assert( BER_VALID( ber ) );	assert( BER_VALID( ber ) );

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

return( ber_peek_tag( ber, len ) );	return ber_peek_tag( ber, len );
}	}

/* VARARGS */	/* VARARGS */
Line 729 ber_scanf ( BerElement *ber,	Line 744 ber_scanf ( BerElement *ber,
va_end( ap );	va_end( ap );
}	}

return( rc );	return rc;
}	}

Removed from v.1.34.6.5
changed lines
	Added in v.1.34.6.6