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.17 and 1.24

version 1.17, 1999/03/03 14:57:57	version 1.24, 1999/05/20 17:38:03
Line 38 ber_get_tag( BerElement *ber )	Line 38 ber_get_tag( BerElement *ber )
char *tagp;	char *tagp;
unsigned int i;	unsigned int i;

	assert( ber != NULL );

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

Line 69 ber_skip_tag( BerElement *ber, unsigned	Line 71 ber_skip_tag( BerElement *ber, unsigned
{	{
unsigned long tag;	unsigned long tag;
unsigned char lc;	unsigned char lc;
int noctets, diff;	unsigned int noctets;
	int diff;
unsigned long netlen;	unsigned long netlen;

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

/*	/*
* 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 byte (we	* Assuming everything's ok, we return the tag byte (we
Line 99 ber_skip_tag( BerElement *ber, unsigned	Line 105 ber_skip_tag( BerElement *ber, unsigned
*len = netlen = 0;	*len = netlen = 0;
if ( ber_read( ber, (char *) &lc, 1 ) != 1 )	if ( ber_read( ber, (char *) &lc, 1 ) != 1 )
return( LBER_DEFAULT );	return( LBER_DEFAULT );
if ( lc & 0x80 ) {	if ( lc & 0x80U ) {
noctets = (lc & 0x7f);	noctets = (lc & 0x7fU);
if ( noctets > sizeof(unsigned long) )	if ( (unsigned) noctets > sizeof(unsigned long) )
return( LBER_DEFAULT );	return( LBER_DEFAULT );
diff = sizeof(unsigned long) - noctets;	diff = sizeof(unsigned long) - noctets;
if ( ber_read( ber, (char *) &netlen + diff, noctets )	if ( (unsigned) ber_read( ber, (char *) &netlen + diff, noctets )
!= noctets )	!= noctets )
return( LBER_DEFAULT );	return( LBER_DEFAULT );
*len = AC_NTOHL( netlen );	*len = AC_NTOHL( netlen );
Line 116 ber_skip_tag( BerElement *ber, unsigned	Line 122 ber_skip_tag( BerElement *ber, unsigned
}	}

unsigned long	unsigned long
ber_peek_tag( BerElement ber, unsigned long len )	ber_peek_tag(
	LDAP_CONST BerElement ber_in, / not const per c-api-02 */
	unsigned long *len )
{	{
char *save;
unsigned long tag;	unsigned long tag;
	BerElement *ber = ber_dup( ber_in );

	if( ber == NULL ) {
	return LBER_ERROR;
	}

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

	ber_free( ber, 1 );
return( tag );	return( tag );
}	}

Line 135 ber_getnint( BerElement ber, long num,	Line 146 ber_getnint( BerElement ber, long num,
long netnum;	long netnum;
char *p;	char *p;

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

/*	/*
* The tag and length have already been stripped off. We should	* The tag and length have already been stripped off. We should
* be sitting right before len bytes of 2's complement integer,	* be sitting right before len bytes of 2's complement integer,
Line 142 ber_getnint( BerElement ber, long num,	Line 156 ber_getnint( BerElement ber, long num,
* extend after we read it in.	* extend after we read it in.
*/	*/

if ( len > sizeof(long) )	if ( (unsigned) len > sizeof(long) )
return( -1 );	return( -1 );

netnum = 0;	netnum = 0;
Line 154 ber_getnint( BerElement ber, long num,	Line 168 ber_getnint( BerElement ber, long num,
/* sign extend if necessary */	/* sign extend if necessary */
p = (char *) &netnum;	p = (char *) &netnum;
sign = (0x80 & *(p+diff) );	sign = (0x80 & *(p+diff) );
if ( sign && len < sizeof(long) ) {	if ( sign && ((unsigned) len < sizeof(long)) ) {
for ( i = 0; i < diff; i++ ) {	for ( i = 0; i < diff; i++ ) {
*(p+i) = (unsigned char) 0xff;	*(p+i) = (unsigned char) 0xff;
}	}
Line 396 ber_next_element( BerElement *ber, unsig	Line 410 ber_next_element( BerElement *ber, unsig
unsigned long	unsigned long
ber_scanf	ber_scanf
#if HAVE_STDARG	#if HAVE_STDARG
( BerElement ber, char fmt, ... )	( BerElement *ber,
	LDAP_CONST char *fmt,
	... )
#else	#else
( va_alist )	( va_alist )
va_dcl	va_dcl
Line 407 va_dcl	Line 423 va_dcl
BerElement *ber;	BerElement *ber;
char *fmt;	char *fmt;
#endif	#endif
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;
Line 415 va_dcl	Line 431 va_dcl
long *l;	long *l;
unsigned long rc, tag, len;	unsigned long rc, tag, len;

	assert( ber != NULL );

#ifdef HAVE_STDARG	#ifdef HAVE_STDARG
va_start( ap, fmt );	va_start( ap, fmt );
#else	#else
Line 422 va_dcl	Line 440 va_dcl
ber = va_arg( ap, BerElement * );	ber = va_arg( ap, BerElement * );
fmt = va_arg( ap, char * );	fmt = va_arg( ap, char * );
#endif	#endif

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

fmt_reset = fmt;	fmt_reset = fmt;

if ( ber->ber_debug ) {	ber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug,
lber_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 );
lber_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
* the error-cleanup code below accordingly. */	* the error-cleanup code below accordingly. */
switch ( *fmt ) {	switch ( *fmt ) {
	case '!': { /* Hook */
	BERDecodeCallback *f;
	void *p;

	f = va_arg( ap, BERDecodeCallback * );
	p = va_arg( ap, void * );

	rc = (*f)( ber, p, 0 );
	} break;

case 'a': /* octet string - allocate storage as needed */	case 'a': /* octet string - allocate storage as needed */
ss = va_arg( ap, char ** );	ss = va_arg( ap, char ** );
rc = ber_get_stringa( ber, ss );	rc = ber_get_stringa( ber, ss );
Line 452 va_dcl	Line 482 va_dcl

case 'l': /* length of next item */	case 'l': /* length of next item */
l = va_arg( ap, long * );	l = va_arg( ap, long * );
rc = ber_peek_tag( ber, (unsigned long *)l );	rc = ber_peek_tag( ber, l );
break;	break;

case 'n': /* null */	case 'n': /* null */
Line 462 va_dcl	Line 492 va_dcl
case 's': /* octet string - in a buffer */	case 's': /* octet string - in a buffer */
s = va_arg( ap, char * );	s = va_arg( ap, char * );
l = va_arg( ap, long * );	l = va_arg( ap, long * );
rc = ber_get_stringb( ber, s, (unsigned long *)l );	rc = ber_get_stringb( ber, s, l );
break;	break;

case 'o': /* octet string in a supplied berval */	case 'o': /* octet string in a supplied berval */
Line 479 va_dcl	Line 509 va_dcl
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 ** );
l = va_arg( ap, long * ); /* for length, in bits */	l = va_arg( ap, long * ); /* for length, in bits */
rc = ber_get_bitstringa( ber, ss, (unsigned long *)l );	rc = ber_get_bitstringa( ber, ss, l );
break;	break;

case 't': /* tag of next item */	case 't': /* tag of next item */
i = va_arg( ap, int * );	l = va_arg( ap, long * );
*i = rc = ber_peek_tag( ber, &len );	*l = rc = ber_peek_tag( ber, &len );
break;	break;

case 'T': /* skip tag of next item */	case 'T': /* skip tag of next item */
i = va_arg( ap, int * );	l = va_arg( ap, long * );
*i = rc = ber_skip_tag( ber, &len );	*l = rc = ber_skip_tag( ber, &len );
break;	break;

case 'v': /* sequence of strings */	case 'v': /* sequence of strings */
Line 498 va_dcl	Line 528 va_dcl
j = 0;	j = 0;
for ( tag = ber_first_element( ber, &len, &last );	for ( tag = ber_first_element( ber, &len, &last );
tag != LBER_DEFAULT &&	tag != LBER_DEFAULT &&
#ifdef LDAP_END_SEQORSET	#ifdef LBER_END_SEQORSET
tag != LBER_END_SEQORSET &&	tag != LBER_END_SEQORSET &&
#endif	#endif
rc != LBER_DEFAULT;	rc != LBER_DEFAULT;
Line 514 va_dcl	Line 544 va_dcl
rc = ber_get_stringa( ber, &((*sss)[j]) );	rc = ber_get_stringa( ber, &((*sss)[j]) );
j++;	j++;
}	}
#ifdef LDAP_END_SEQORSET	#ifdef LBER_END_SEQORSET
if (rc != LBER_DEFAULT &&	if (rc != LBER_DEFAULT &&
tag != LBER_END_SEQORSET )	tag != LBER_END_SEQORSET )
{	{
Line 531 va_dcl	Line 561 va_dcl
j = 0;	j = 0;
for ( tag = ber_first_element( ber, &len, &last );	for ( tag = ber_first_element( ber, &len, &last );
tag != LBER_DEFAULT &&	tag != LBER_DEFAULT &&
#ifdef LDAP_END_SEQORSET	#ifdef LBER_END_SEQORSET
tag != LBER_END_SEQORSET &&	tag != LBER_END_SEQORSET &&
#endif	#endif
rc != LBER_DEFAULT;	rc != LBER_DEFAULT;
Line 547 va_dcl	Line 577 va_dcl
rc = ber_get_stringal( ber, &((*bv)[j]) );	rc = ber_get_stringal( ber, &((*bv)[j]) );
j++;	j++;
}	}
#ifdef LDAP_END_SEQORSET	#ifdef LBER_END_SEQORSET
if (rc != LBER_DEFAULT &&	if (rc != LBER_DEFAULT &&
tag != LBER_END_SEQORSET )	tag != LBER_END_SEQORSET )
{	{
Line 576 va_dcl	Line 606 va_dcl

default:	default:
if( ber->ber_debug ) {	if( ber->ber_debug ) {
lber_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 );
}	}
rc = LBER_DEFAULT;	rc = LBER_DEFAULT;
Line 601 va_dcl	Line 631 va_dcl

for ( ; fmt_reset < fmt; fmt_reset++ ) {	for ( ; fmt_reset < fmt; fmt_reset++ ) {
switch ( *fmt_reset ) {	switch ( *fmt_reset ) {
	case '!': { /* Hook */
	BERDecodeCallback *f;
	void *p;

	f = va_arg( ap, BERDecodeCallback * );
	p = va_arg( ap, void * );

	(void) (*f)( ber, p, 1 );
	} break;

case 'a': /* octet string - allocate storage as needed */	case 'a': /* octet string - allocate storage as needed */
ss = va_arg( ap, char ** );	ss = va_arg( ap, char ** );
if ( *ss ) {	if ( *ss ) {
Line 610 va_dcl	Line 650 va_dcl
break;	break;

case 'b': /* boolean */	case 'b': /* boolean */
case 't': /* tag of next item */
case 'T': /* skip tag of next item */
(void) va_arg( ap, int * );	(void) va_arg( ap, int * );
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 * );
/* Fall through */	(void) va_arg( ap, long * );
	break;

case 'e': /* enumerated */	case 'e': /* enumerated */
case 'i': /* int */	case 'i': /* int */
case 'l': /* length of next item */	case 'l': /* length of next item */
	case 't': /* tag of next item */
	case 'T': /* skip tag of next item */
(void) va_arg( ap, long * );	(void) va_arg( ap, long * );
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 * );
if ( bval->bv_val ) {	if ( bval->bv_val != NULL ) {
free( bval->bv_val );	free( bval->bv_val );
bval->bv_val = NULL;	bval->bv_val = NULL;
}	}
Line 653 va_dcl	Line 695 va_dcl
case 'v': /* sequence of strings */	case 'v': /* sequence of strings */
sss = va_arg( ap, char *** );	sss = va_arg( ap, char *** );
if ( *sss ) {	if ( *sss ) {
for (j = 0; (*sss)[j]; j++)	for (j = 0; (*sss)[j]; j++) {
free( (*sss)[j] );	free( (*sss)[j] );
	(*sss)[j] = NULL;
	}
free( *sss );	free( *sss );
*sss = NULL;	*sss = NULL;
}	}
Line 668 va_dcl	Line 712 va_dcl
}	}
break;	break;

#if 0 /* No action for these format characters */
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 */
case '[': /* begin set */	case '[': /* begin set */
case '}': /* end sequence */	case '}': /* end sequence */
case ']': /* end set */	case ']': /* end set */
#endif	break;

	default:
	/* format should be good */
	assert( 0 );
}	}
}	}

Line 689 va_dcl	Line 735 va_dcl
void	void
ber_bvfree( struct berval *bv )	ber_bvfree( struct berval *bv )
{	{
#ifdef LBER_ASSERT
assert(bv != NULL); /* bv damn better point to something */	assert(bv != NULL); /* bv damn better point to something */
#endif
if ( bv->bv_val != NULL )	if ( bv->bv_val != NULL )
free( bv->bv_val );	free( bv->bv_val );
free( (char *) bv );	free( (char *) bv );
Line 702 ber_bvecfree( struct berval **bv )	Line 747 ber_bvecfree( struct berval **bv )
{	{
int i;	int i;

#ifdef LBER_ASSERT
assert(bv != NULL); /* bv damn better point to something */	assert(bv != NULL); /* bv damn better point to something */
#endif
for ( i = 0; bv[i] != NULL; i++ )	for ( i = 0; bv[i] != NULL; i++ )
ber_bvfree( bv[i] );	ber_bvfree( bv[i] );
free( (char *) bv );	free( (char *) bv );
}	}

struct berval *	struct berval *
ber_bvdup( struct berval *bv )	ber_bvdup(
	LDAP_CONST struct berval *bv )
{	{
struct berval *new;	struct berval *new;

	assert( bv != NULL );

	if( bv == NULL ) {
	return NULL;
	}

if ( (new = (struct berval *) malloc( sizeof(struct berval) ))	if ( (new = (struct berval *) malloc( sizeof(struct berval) ))
== NULL ) {	== NULL ) {
return( NULL );	return( NULL );
Line 744 void	Line 795 void
ber_set_string_translators( BerElement *ber, BERTranslateProc encode_proc,	ber_set_string_translators( BerElement *ber, BERTranslateProc encode_proc,
BERTranslateProc decode_proc )	BERTranslateProc decode_proc )
{	{
	assert( ber != NULL );

ber->ber_encode_translate_proc = encode_proc;	ber->ber_encode_translate_proc = encode_proc;
ber->ber_decode_translate_proc = decode_proc;	ber->ber_decode_translate_proc = decode_proc;
}	}

Removed from v.1.17
changed lines
	Added in v.1.24