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.5.2.4.2.2 and 1.12

version 1.5.2.4.2.2, 1999/01/23 21:05:03	version 1.12, 1998/12/22 00:34:02
Line 1	Line 1
/* decode.c - ber input decoding routines */	/* decode.c - ber input decoding routines */
/*	/*
* Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/* Portions
* Copyright (c) 1990 Regents of the University of Michigan.	* Copyright (c) 1990 Regents of the University of Michigan.
* All rights reserved.	* All rights reserved.
*	*
Line 25	Line 21
#include <ac/string.h>	#include <ac/string.h>
#include <ac/socket.h>	#include <ac/socket.h>

#include "lber.h"	#include "lber-int.h"

int lber_debug;

static int ber_getnint LDAP_P(( BerElement ber, long num, int len ));	static int ber_getnint LDAP_P(( BerElement ber, long num, int len ));

Line 226 ber_get_stringa( BerElement ber, char	Line 220 ber_get_stringa( BerElement ber, char
{	{
unsigned long datalen, tag;	unsigned long datalen, tag;

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

if ( (buf = (char ) malloc( (size_t)datalen + 1 )) == NULL )	if ( (buf = (char ) malloc( (size_t)datalen + 1 )) == NULL )
return( LBER_DEFAULT );	return( LBER_DEFAULT );

if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen ) {	if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen )
free( *buf );
*buf = NULL;
return( LBER_DEFAULT );	return( LBER_DEFAULT );
}
(*buf)[datalen] = '\0';	(*buf)[datalen] = '\0';

#ifdef STR_TRANSLATION	#ifdef STR_TRANSLATION
Line 248 ber_get_stringa( BerElement ber, char	Line 237 ber_get_stringa( BerElement ber, char
if ( (*(ber->ber_decode_translate_proc))( buf, &datalen, 1 )	if ( (*(ber->ber_decode_translate_proc))( buf, &datalen, 1 )
!= 0 ) {	!= 0 ) {
free( *buf );	free( *buf );
*buf = NULL;
return( LBER_DEFAULT );	return( LBER_DEFAULT );
}	}
}	}
Line 262 ber_get_stringal( BerElement *ber, struc	Line 250 ber_get_stringal( BerElement *ber, struc
{	{
unsigned long len, tag;	unsigned long len, tag;

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

if ( (bv = (struct berval ) malloc( sizeof(struct berval) )) == NULL )	if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT )
return( LBER_DEFAULT );	return( LBER_DEFAULT );

if ( ((bv)->bv_val = (char ) malloc( (size_t)len + 1 )) == NULL ) {	if ( ((bv)->bv_val = (char ) malloc( (size_t)len + 1 )) == NULL )
free( *bv );
*bv = NULL;
return( LBER_DEFAULT );	return( LBER_DEFAULT );
}

if ( (unsigned long) ber_read( ber, (*bv)->bv_val, len ) != len ) {	if ( (unsigned long) ber_read( ber, (*bv)->bv_val, len ) != len )
ber_bvfree( *bv );
*bv = NULL;
return( LBER_DEFAULT );	return( LBER_DEFAULT );
}
((*bv)->bv_val)[len] = '\0';	((*bv)->bv_val)[len] = '\0';
(*bv)->bv_len = len;	(*bv)->bv_len = len;

Line 290 ber_get_stringal( BerElement *ber, struc	Line 270 ber_get_stringal( BerElement *ber, struc
++len;	++len;
if ( ((ber->ber_decode_translate_proc))( &((bv)->bv_val),	if ( ((ber->ber_decode_translate_proc))( &((bv)->bv_val),
&len, 1 ) != 0 ) {	&len, 1 ) != 0 ) {
ber_bvfree( *bv );	free( (*bv)->bv_val );
*bv = NULL;
return( LBER_DEFAULT );	return( LBER_DEFAULT );
}	}
(*bv)->bv_len = len - 1;	(*bv)->bv_len = len - 1;
Line 307 ber_get_bitstringa( BerElement *ber, cha	Line 286 ber_get_bitstringa( BerElement *ber, cha
unsigned long datalen, tag;	unsigned long datalen, tag;
unsigned char unusedbits;	unsigned char unusedbits;

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

if ( (buf = (char ) malloc( (size_t)datalen )) == NULL )	if ( (buf = (char ) malloc( (size_t)datalen )) == NULL )
return( LBER_DEFAULT );	return( LBER_DEFAULT );

if ( ber_read( ber, (char *)&unusedbits, 1 ) != 1 ) {	if ( ber_read( ber, (char *)&unusedbits, 1 ) != 1 )
free( buf );
*buf = NULL;
return( LBER_DEFAULT );	return( LBER_DEFAULT );
}

if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen ) {	if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen )
free( buf );
*buf = NULL;
return( LBER_DEFAULT );	return( LBER_DEFAULT );
}

blen = datalen 8 - unusedbits;	blen = datalen 8 - unusedbits;
return( tag );	return( tag );
Line 363 ber_first_element( BerElement *ber, unsi	Line 334 ber_first_element( BerElement *ber, unsi
{	{
/* 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;
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 ) {
	#ifdef LBER_END_SEQORSET
	return( LBER_END_SEQORSET );
	#else
return( LBER_DEFAULT );	return( LBER_DEFAULT );
	#endif
}	}

return( ber_peek_tag( ber, len ) );	return( ber_peek_tag( ber, len ) );
Line 380 unsigned long	Line 354 unsigned long
ber_next_element( BerElement ber, unsigned long len, char *last )	ber_next_element( BerElement ber, unsigned long len, char *last )
{	{
if ( ber->ber_ptr == last ) {	if ( ber->ber_ptr == last ) {
	#ifdef LBER_END_SEQORSET
	return( LBER_END_SEQORSET );
	#else
return( LBER_DEFAULT );	return( LBER_DEFAULT );
	#endif
}	}

return( ber_peek_tag( ber, len ) );	return( ber_peek_tag( ber, len ) );
Line 401 va_dcl	Line 379 va_dcl
BerElement *ber;	BerElement *ber;
char *fmt;	char *fmt;
#endif	#endif
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 416 va_dcl	Line 393 va_dcl
ber = va_arg( ap, BerElement * );	ber = va_arg( ap, BerElement * );
fmt = va_arg( ap, char * );	fmt = va_arg( ap, char * );
#endif	#endif
fmt_reset = fmt;

#ifdef LDAP_DEBUG	if ( ber->ber_debug ) {
if ( lber_debug & 64 ) {	lber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug,
fprintf( stderr, "ber_scanf fmt (%s) ber:\n", fmt );	"ber_scanf fmt (%s) ber:\n", fmt );
ber_dump( ber, 1 );	lber_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
* the error-cleanup code below accordingly. */
switch ( *fmt ) {	switch ( *fmt ) {
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 ** );
Line 492 va_dcl	Line 465 va_dcl
*sss = NULL;	*sss = NULL;
j = 0;	j = 0;
for ( tag = ber_first_element( ber, &len, &last );	for ( tag = ber_first_element( ber, &len, &last );
tag != LBER_DEFAULT && rc != LBER_DEFAULT;	tag != LBER_DEFAULT &&
tag = ber_next_element( ber, &len, last ) ) {	#ifdef LDAP_END_SEQORSET
	tag != LBER_END_SEQORSET &&
	#endif
	rc != LBER_DEFAULT;
	tag = ber_next_element( ber, &len, last ) )
	{
if ( *sss == NULL ) {	if ( *sss == NULL ) {
sss = (char *) malloc(	sss = (char *) malloc(
2 * sizeof(char *) );	2 * sizeof(char *) );
Line 504 va_dcl	Line 482 va_dcl
rc = ber_get_stringa( ber, &((*sss)[j]) );	rc = ber_get_stringa( ber, &((*sss)[j]) );
j++;	j++;
}	}
	#ifdef LDAP_END_SEQORSET
	if (rc != LBER_DEFAULT &&
	tag != LBER_END_SEQORSET )
	{
	rc = LBER_DEFAULT;
	}
	#endif
if ( j > 0 )	if ( j > 0 )
(*sss)[j] = NULL;	(*sss)[j] = NULL;
break;	break;
Line 513 va_dcl	Line 498 va_dcl
*bv = NULL;	*bv = NULL;
j = 0;	j = 0;
for ( tag = ber_first_element( ber, &len, &last );	for ( tag = ber_first_element( ber, &len, &last );
tag != LBER_DEFAULT && rc != LBER_DEFAULT;	tag != LBER_DEFAULT &&
tag = ber_next_element( ber, &len, last ) ) {	#ifdef LDAP_END_SEQORSET
	tag != LBER_END_SEQORSET &&
	#endif
	rc != LBER_DEFAULT;
	tag = ber_next_element( ber, &len, last ) )
	{
if ( *bv == NULL ) {	if ( *bv == NULL ) {
bv = (struct berval *) malloc(	bv = (struct berval *) malloc(
2 * sizeof(struct berval *) );	2 * sizeof(struct berval *) );
Line 525 va_dcl	Line 515 va_dcl
rc = ber_get_stringal( ber, &((*bv)[j]) );	rc = ber_get_stringal( ber, &((*bv)[j]) );
j++;	j++;
}	}
	#ifdef LDAP_END_SEQORSET
	if (rc != LBER_DEFAULT &&
	tag != LBER_END_SEQORSET )
	{
	rc = LBER_DEFAULT;
	}
	#endif
if ( j > 0 )	if ( j > 0 )
(*bv)[j] = NULL;	(*bv)[j] = NULL;
break;	break;
Line 546 va_dcl	Line 543 va_dcl
break;	break;

default:	default:
#ifdef LDAP_LIBUI	if( ber->ber_debug ) {
fprintf( stderr, "unknown fmt %c\n", *fmt );	lber_log_printf( LDAP_DEBUG_ANY, ber->ber_debug,
#endif /* LDAP_LIBUI */	"ber_scanf: unknown fmt %c\n", *fmt );
	}
rc = LBER_DEFAULT;	rc = LBER_DEFAULT;
break;	break;
}	}
Line 556 va_dcl	Line 554 va_dcl

va_end( ap );	va_end( ap );

if ( rc == LBER_DEFAULT ) {
/*
* Error. Reclaim malloced memory that was given to the caller.
* Set allocated pointers to NULL, "data length" outvalues to 0.
*/
#ifdef HAVE_STDARG
va_start( ap, fmt );
#else
va_start( ap );
(void) va_arg( ap, BerElement * );
(void) va_arg( ap, char * );
#endif

for ( ; fmt_reset < fmt; fmt_reset++ ) {
switch ( *fmt_reset ) {
case 'a': /* octet string - allocate storage as needed */
ss = va_arg( ap, char ** );
if ( *ss ) {
free( *ss );
*ss = NULL;
}
break;

case 'b': /* boolean */
case 't': /* tag of next item */
case 'T': /* skip tag of next item */
(void) va_arg( ap, int * );
break;

case 's': /* octet string - in a buffer */
(void) va_arg( ap, char * );
/* Fall through */
case 'e': /* enumerated */
case 'i': /* int */
case 'l': /* length of next item */
(void) va_arg( ap, long * );
break;

case 'o': /* octet string in a supplied berval */
bval = va_arg( ap, struct berval * );
if ( bval->bv_val ) {
free( bval->bv_val );
bval->bv_val = NULL;
}
bval->bv_len = 0;
break;

case 'O': /* octet string - allocate & include length */
bvp = va_arg( ap, struct berval ** );
if ( *bvp ) {
ber_bvfree( *bvp );
*bvp = NULL;
}
break;

case 'B': /* bit string - allocate storage as needed */
ss = va_arg( ap, char ** );
if ( *ss ) {
free( *ss );
*ss = NULL;
}
(va_arg( ap, long )) = 0; /* for length, in bits */
break;

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

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

#if 0 /* No action for these format characters */
case 'n': /* null */
case 'x': /* skip the next element - whatever it is */
case '{': /* begin sequence */
case '[': /* begin set */
case '}': /* end sequence */
case ']': /* end set */
#endif

}
}

va_end( ap );
}

return( rc );	return( rc );
}	}

void	void
ber_bvfree( struct berval *bv )	ber_bvfree( struct berval *bv )
{	{
	#ifdef LBER_ASSERT
	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 669 ber_bvecfree( struct berval **bv )	Line 573 ber_bvecfree( struct berval **bv )
{	{
int i;	int i;

	#ifdef LBER_ASSERT
	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 );
Line 683 ber_bvdup( struct berval *bv )	Line 590 ber_bvdup( struct berval *bv )
== NULL ) {	== NULL ) {
return( NULL );	return( NULL );
}	}

	if ( bv->bv_val == NULL ) {
	new->bv_val = NULL;
	new->bv_len = 0;
	return ( new );
	}

if ( (new->bv_val = (char *) malloc( bv->bv_len + 1 )) == NULL ) {	if ( (new->bv_val = (char *) malloc( bv->bv_len + 1 )) == NULL ) {
	free( new );
return( NULL );	return( NULL );
}	}

SAFEMEMCPY( new->bv_val, bv->bv_val, (size_t) bv->bv_len );	SAFEMEMCPY( new->bv_val, bv->bv_val, (size_t) bv->bv_len );
new->bv_val[bv->bv_len] = '\0';	new->bv_val[bv->bv_len] = '\0';
new->bv_len = bv->bv_len;	new->bv_len = bv->bv_len;

Removed from v.1.5.2.4.2.2
changed lines
	Added in v.1.12