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.30 and 1.34.6.9

version 1.30, 1999/05/29 03:16:31	version 1.34.6.9, 2001/12/04 18:49:15
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.8 2001/11/06 16:49:17 kurt Exp $ */
/*	/*
* Copyright 1998-1999 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
*/	*/
/* Portions	/* Portions
Line 18	Line 19
#include "portable.h"	#include "portable.h"

#include <stdio.h>	#include <stdio.h>
#include <stdlib.h>

#include <ac/stdarg.h>	#include <ac/stdlib.h>

	#include <ac/stdarg.h>
#include <ac/string.h>	#include <ac/string.h>
#include <ac/socket.h>	#include <ac/socket.h>

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

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

/* return the tag - LBER_DEFAULT returned means trouble */	/* return the tag - LBER_DEFAULT returned means trouble */
unsigned long	ber_tag_t
ber_get_tag( BerElement *ber )	ber_get_tag( BerElement *ber )
{	{
unsigned char xbyte;	unsigned char xbyte;
unsigned long tag;	ber_tag_t tag;
char *tagp;
unsigned int i;	unsigned int i;

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;

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

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

tagp[i] = xbyte;	tag <<= 8;
	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(long) )	if ( i == sizeof(ber_tag_t) ) {
return( LBER_DEFAULT );	return LBER_DEFAULT;
	}

/* want leading, not trailing 0's */	return tag;
return( tag >> (sizeof(long) - i - 1) );
}	}

unsigned long	ber_tag_t
ber_skip_tag( BerElement ber, unsigned long len )	ber_skip_tag( BerElement ber, ber_len_t len )
{	{
unsigned long tag;	ber_tag_t tag;
unsigned char lc;	unsigned char lc;
unsigned int noctets;	ber_len_t i, noctets;
int diff;	unsigned char netlen[sizeof(ber_len_t)];
unsigned long netlen;

assert( ber != NULL );	assert( ber != NULL );
assert( len != NULL );	assert( len != NULL );
Line 90 ber_skip_tag( BerElement *ber, unsigned	Line 97 ber_skip_tag( BerElement *ber, unsigned
* 2) primitive encodings used whenever possible	* 2) primitive encodings used whenever possible
*/	*/

	*len = 0;

/*	/*
* 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
* 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 an unsigned long.	* greater than what we can hold in a ber_len_t.
*/	*/

*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 & 0x80U ) {	if ( lc & 0x80U ) {
noctets = (lc & 0x7fU);	noctets = (lc & 0x7fU);
if ( (unsigned) noctets > sizeof(unsigned long) )
return( LBER_DEFAULT );	if ( noctets > sizeof(ber_len_t) ) {
diff = sizeof(unsigned long) - noctets;	return LBER_DEFAULT;
if ( (unsigned) ber_read( ber, (char *) &netlen + diff, noctets )	}
!= noctets )
return( LBER_DEFAULT );	if( (unsigned) ber_read( ber, netlen, noctets ) != noctets ) {
*len = AC_NTOHL( netlen );	return LBER_DEFAULT;
	}

	for( i = 0; i < noctets; i++ ) {
	*len <<= 8;
	*len \|= netlen[i];
	}

} else {	} else {
*len = lc;	*len = lc;
}	}

return( tag );	/* BER element should have enough data left */
	if( *len > ber_pvt_ber_remaining( ber ) ) {
	return LBER_DEFAULT;
	}

	return tag;
}	}

unsigned long	ber_tag_t
ber_peek_tag(	ber_peek_tag(
LDAP_CONST BerElement ber_in, / not const per c-api-02 */	BerElement *ber,
unsigned long *len )	ber_len_t *len )
{	{
unsigned long tag;	/*
BerElement *ber;	* This implementation assumes ber_skip_tag() only
	* modifies ber_ptr field of the BerElement.
assert( ber_in != NULL );	*/
assert( BER_VALID( ber_in ) );

ber = ber_dup( ber_in );

if( ber == NULL ) {	char *save;
return LBER_ERROR;	ber_tag_t tag;
}

assert( BER_VALID( ber ) );

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

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

static int	static ber_len_t
ber_getnint( BerElement ber, long num, int len )	ber_getnint(
	BerElement *ber,
	ber_int_t *num,
	ber_len_t len )
{	{
int diff, sign, i;	unsigned char buf[sizeof(ber_int_t)];
long netnum;
char *p;

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

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

/*	/*
Line 167 ber_getnint( BerElement ber, long num,	Line 184 ber_getnint( BerElement ber, long num,
* extend after we read it in.	* extend after we read it in.
*/	*/

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

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

	if( len ) {
	/* sign extend if necessary */
	ber_len_t i;
	ber_int_t netnum = 0x80 & buf[0] ? -1 : 0;

netnum = 0;	/* shift in the bytes */
diff = sizeof(long) - len;	for( i=0 ; i<len; i++ ) {
/* read into the low-order bytes of netnum */	netnum = (netnum << 8 ) \| buf[i];
if ( ber_read( ber, ((char *) &netnum) + diff, len ) != len )
return( -1 );

/* sign extend if necessary */
p = (char *) &netnum;
sign = (0x80 & *(p+diff) );
if ( sign && ((unsigned) len < sizeof(long)) ) {
for ( i = 0; i < diff; i++ ) {
*(p+i) = (unsigned char) 0xff;
}	}

	*num = netnum;

	} else {
	*num = 0;
}	}
*num = AC_NTOHL( netnum );

return( len );	return len;
}	}

unsigned long	ber_tag_t
ber_get_int( BerElement ber, long num )	ber_get_int(
	BerElement *ber,
	ber_int_t *num )
{	{
unsigned long tag, len;	ber_tag_t tag;
	ber_len_t len;

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 ( (unsigned long) ber_getnint( ber, num, (int)len ) != len )	if ( ber_getnint( ber, num, len ) != len ) {
return( LBER_DEFAULT );	return LBER_DEFAULT;
else	}
return( tag );
	return tag;
}	}

unsigned long	ber_tag_t
ber_get_stringb( BerElement ber, char buf, unsigned long *len )	ber_get_enum(
	BerElement *ber,
	ber_int_t *num )
{	{
unsigned long datalen, tag;	return ber_get_int( ber, num );
#ifdef STR_TRANSLATION	}
char *transbuf;
#endif /* STR_TRANSLATION */	ber_tag_t
	ber_get_stringb(
	BerElement *ber,
	char *buf,
	ber_len_t *len )
	{
	ber_len_t datalen;
	ber_tag_t tag;

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 ( (unsigned long) ber_read( ber, buf, datalen ) != datalen )
return( LBER_DEFAULT );

buf[datalen] = '\0';	/* must fit within allocated space with termination */
	if ( datalen >= *len ) {
	return LBER_DEFAULT;
	}

#ifdef STR_TRANSLATION	if ( (ber_len_t) ber_read( ber, buf, datalen ) != datalen ) {
if ( datalen > 0 && ( ber->ber_options & LBER_TRANSLATE_STRINGS ) != 0	return LBER_DEFAULT;
&& ber->ber_decode_translate_proc ) {
transbuf = buf;
++datalen;
if ( (*(ber->ber_decode_translate_proc))( &transbuf, &datalen,
0 ) != 0 ) {
return( LBER_DEFAULT );
}
if ( datalen > *len ) {
LBER_FREE( transbuf );
return( LBER_DEFAULT );
}
SAFEMEMCPY( buf, transbuf, datalen );
LBER_FREE( transbuf );
--datalen;
}	}
#endif /* STR_TRANSLATION */
	buf[datalen] = '\0';

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

unsigned long	ber_tag_t
ber_get_stringa( BerElement ber, char *buf )	ber_get_stringa( BerElement ber, char *buf )
{	{
unsigned long datalen, tag;	ber_len_t datalen;
	ber_tag_t tag;

assert( ber != NULL );	assert( ber != NULL );
assert( buf != NULL );	assert( buf != NULL );
Line 262 ber_get_stringa( BerElement ber, char	Line 286 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( (size_t)datalen + 1 )) == NULL )	if ( (buf = (char ) LBER_MALLOC( datalen + 1 )) == NULL ) {
return( LBER_DEFAULT );	return LBER_DEFAULT;
	}

if ( (unsigned long) 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';

#ifdef STR_TRANSLATION	return tag;
if ( datalen > 0 && ( ber->ber_options & LBER_TRANSLATE_STRINGS ) != 0
&& ber->ber_decode_translate_proc ) {
++datalen;
if ( (*(ber->ber_decode_translate_proc))( buf, &datalen, 1 )
!= 0 ) {
LBER_FREE( *buf );
*buf = NULL;
return( LBER_DEFAULT );
}
}
#endif /* STR_TRANSLATION */

return( tag );
}	}

unsigned long	ber_tag_t
ber_get_stringal( BerElement ber, struct berval *bv )	ber_get_stringal( BerElement ber, struct berval *bv )
{	{
unsigned long len, tag;	ber_len_t len;
	ber_tag_t tag;

assert( ber != NULL );	assert( ber != NULL );
assert( bv != NULL );	assert( bv != NULL );
Line 303 ber_get_stringal( BerElement *ber, struc	Line 316 ber_get_stringal( BerElement *ber, struc

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

if ( (bv = (struct berval ) LBER_MALLOC( sizeof(struct berval) )) == NULL )	bv = (struct berval ) LBER_MALLOC( sizeof(struct berval) );
return( LBER_DEFAULT );	if ( *bv == NULL ) {
	return LBER_DEFAULT;
	}

if ( ((bv)->bv_val = (char ) LBER_MALLOC( (size_t)len + 1 )) == NULL ) {	if( len == 0 ) {
	(*bv)->bv_val = NULL;
	(*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 );	return LBER_DEFAULT;
}	}

if ( (unsigned long) ber_read( ber, (*bv)->bv_val, len ) != len ) {	if ( (ber_len_t) ber_read( ber, (*bv)->bv_val, len ) != len ) {
ber_bvfree( *bv );	ber_bvfree( *bv );
*bv = NULL;	*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;

#ifdef STR_TRANSLATION	return tag;
if ( len > 0 && ( ber->ber_options & LBER_TRANSLATE_STRINGS ) != 0
&& ber->ber_decode_translate_proc ) {
++len;
if ( ((ber->ber_decode_translate_proc))( &((bv)->bv_val),
&len, 1 ) != 0 ) {
ber_bvfree( *bv );
*bv = NULL;
return( LBER_DEFAULT );
}
(*bv)->bv_len = len - 1;
}
#endif /* STR_TRANSLATION */

return( tag );
}	}

unsigned long	ber_tag_t
ber_get_bitstringa( BerElement ber, char buf, unsigned long blen )	ber_get_bitstringa(
	BerElement *ber,
	char **buf,
	ber_len_t *blen )
{	{
unsigned long datalen, tag;	ber_len_t datalen;
	ber_tag_t tag;
unsigned char unusedbits;	unsigned char unusedbits;

assert( ber != NULL );	assert( ber != NULL );
Line 354 ber_get_bitstringa( BerElement *ber, cha	Line 367 ber_get_bitstringa( BerElement *ber, cha

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( (size_t)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 ( (unsigned long) 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;
}	}

unsigned long	ber_tag_t
ber_get_null( BerElement *ber )	ber_get_null( BerElement *ber )
{	{
unsigned long len, tag;	ber_len_t len;
	ber_tag_t tag;

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 );
}	}

unsigned long	ber_tag_t
ber_get_boolean( BerElement ber, int boolval )	ber_get_boolean(
	BerElement *ber,
	ber_int_t *boolval )
{	{
long longbool;	ber_int_t longbool;
int rc;	ber_tag_t rc;

assert( ber != NULL );	assert( ber != NULL );
assert( boolval != NULL );	assert( boolval != NULL );
Line 408 ber_get_boolean( BerElement ber, int b	Line 427 ber_get_boolean( BerElement ber, int b
rc = ber_get_int( ber, &longbool );	rc = ber_get_int( ber, &longbool );
*boolval = longbool;	*boolval = longbool;

return( rc );	return rc;
}	}

unsigned long	ber_tag_t
ber_first_element( BerElement ber, unsigned long len, char **last )	ber_first_element(
	BerElement *ber,
	ber_len_t *len,
	char **last )
{	{
assert( ber != NULL );	assert( ber != NULL );
assert( len != NULL );	assert( len != NULL );
Line 421 ber_first_element( BerElement *ber, unsi	Line 443 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;	*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 );
}	}

unsigned long	ber_tag_t
ber_next_element( BerElement ber, unsigned long len, char *last )	ber_next_element(
	BerElement *ber,
	ber_len_t *len,
	LDAP_CONST char *last )
{	{
assert( ber != NULL );	assert( ber != NULL );
assert( len != NULL );	assert( len != NULL );
Line 443 ber_next_element( BerElement *ber, unsig	Line 468 ber_next_element( BerElement *ber, unsig
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 */
unsigned long	ber_tag_t
ber_scanf	ber_scanf ( BerElement *ber,
#if HAVE_STDARG
( BerElement *ber,
LDAP_CONST char *fmt,	LDAP_CONST char *fmt,
... )	... )
#else
( va_alist )
va_dcl
#endif
{	{
va_list ap;	va_list ap;
#ifndef HAVE_STDARG
BerElement *ber;
char *fmt;
#endif
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;
int *i, j;	ber_int_t *i;
long *l;	int j;
unsigned long rc, tag, len;	ber_len_t *l;
	ber_tag_t *t;
	ber_tag_t rc, tag;
	ber_len_t len;

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

assert( ber != NULL );	assert( ber != NULL );
assert( fmt != NULL );	assert( fmt != NULL );
Line 513 va_dcl	Line 525 va_dcl
break;	break;

case 'b': /* boolean */	case 'b': /* boolean */
i = va_arg( ap, int * );	i = va_arg( ap, ber_int_t * );
rc = ber_get_boolean( ber, i );	rc = ber_get_boolean( ber, i );
break;	break;

case 'e': /* enumerated */	case 'e': /* enumerated */
case 'i': /* int */	case 'i': /* int */
l = va_arg( ap, long * );	i = va_arg( ap, ber_int_t * );
rc = ber_get_int( ber, l );	rc = ber_get_int( ber, i );
break;	break;

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

Line 534 va_dcl	Line 546 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, ber_len_t * );
rc = ber_get_stringb( ber, s, l );	rc = ber_get_stringb( ber, s, l );
break;	break;

Line 551 va_dcl	Line 563 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, ber_len_t * ); /* for length, in bits */
rc = ber_get_bitstringa( ber, ss, l );	rc = ber_get_bitstringa( ber, ss, l );
break;	break;

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

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

case 'v': /* sequence of strings */	case 'v': /* sequence of strings */
Line 573 va_dcl	Line 585 va_dcl
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 ) )
{	{
	char *save = sss;

sss = (char ) LBER_REALLOC( sss,	sss = (char ) LBER_REALLOC( sss,
(j + 2) * sizeof(char *) );	(j + 2) * sizeof(char *) );

	if( *sss == NULL ) {
	save[j] = NULL;
	ber_memvfree( (void **) save );
	rc = LBER_DEFAULT;
	goto breakout;
	}

rc = ber_get_stringa( ber, &((*sss)[j]) );	rc = ber_get_stringa( ber, &((*sss)[j]) );
j++;	j++;
}	}
if ( j > 0 )	if ( j > 0 ) (*sss)[j] = NULL;
(*sss)[j] = NULL;
break;	break;

case 'V': /* sequence of strings + lengths */	case 'V': /* sequence of strings + lengths */
Line 591 va_dcl	Line 611 va_dcl
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 ) )
{	{
	struct berval *save = bv;

bv = (struct berval ) LBER_REALLOC( bv,	bv = (struct berval ) LBER_REALLOC( bv,
(j + 2) * sizeof(struct berval *) );	(j + 2) * sizeof(struct berval *) );

	if( *bv == NULL ) {
	save[j] = NULL;
	ber_bvecfree( save );
	rc = LBER_DEFAULT;
	goto breakout;
	}

rc = ber_get_stringal( ber, &((*bv)[j]) );	rc = ber_get_stringal( ber, &((*bv)[j]) );
j++;	j++;
}	}
if ( j > 0 )	if ( j > 0 ) (*bv)[j] = NULL;
(*bv)[j] = NULL;
break;	break;

case 'x': /* skip the next element - whatever it is */	case 'x': /* skip the next element - whatever it is */
Line 627 va_dcl	Line 655 va_dcl
}	}
}	}

	breakout:
va_end( ap );	va_end( ap );

if ( rc == LBER_DEFAULT ) {	if ( rc == LBER_DEFAULT ) {
Line 634 va_dcl	Line 663 va_dcl
* Error. Reclaim malloced memory that was given to the caller.	* Error. Reclaim malloced memory that was given to the caller.
* Set allocated pointers to NULL, "data length" outvalues to 0.	* Set allocated pointers to NULL, "data length" outvalues to 0.
*/	*/
#ifdef HAVE_STDARG
va_start( ap, fmt );	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++ ) {	for ( ; fmt_reset < fmt; fmt_reset++ ) {
switch ( *fmt_reset ) {	switch ( *fmt_reset ) {
Line 663 va_dcl	Line 686 va_dcl
break;	break;

case 'b': /* boolean */	case 'b': /* boolean */
	case 'e': /* enumerated */
	case 'i': /* int */
(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 * );
(void) va_arg( ap, long * );	(void) va_arg( ap, ber_len_t * );
break;	break;

case 'e': /* enumerated */
case 'i': /* int */
case 'l': /* length of next item */	case 'l': /* length of next item */
	(void) va_arg( ap, ber_len_t * );
	break;

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

case 'o': /* octet string in a supplied berval */	case 'o': /* octet string in a supplied berval */
Line 702 va_dcl	Line 728 va_dcl
LBER_FREE( *ss );	LBER_FREE( *ss );
*ss = NULL;	*ss = NULL;
}	}
(va_arg( ap, long )) = 0; /* for length, in bits */	(va_arg( ap, ber_len_t )) = 0; /* for length, in bits */
break;	break;

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++) {	ber_memvfree( (void *) sss );
LBER_FREE( (*sss)[j] );
(*sss)[j] = NULL;
}
LBER_FREE( *sss );
*sss = NULL;	*sss = NULL;
}	}
break;	break;
Line 742 va_dcl	Line 764 va_dcl
va_end( ap );	va_end( ap );
}	}

return( rc );	return rc;
}

void
ber_bvfree( struct berval *bv )
{
assert(bv != NULL); /* bv damn better point to something */

ber_int_options.lbo_valid = LBER_INITIALIZED;

if ( bv->bv_val != NULL )
LBER_FREE( bv->bv_val );
LBER_FREE( (char *) bv );
}

void
ber_bvecfree( struct berval **bv )
{
int i;

assert(bv != NULL); /* bv damn better point to something */

ber_int_options.lbo_valid = LBER_INITIALIZED;

for ( i = 0; bv[i] != NULL; i++ )
ber_bvfree( bv[i] );
LBER_FREE( (char *) bv );
}

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

assert( bv != NULL );

ber_int_options.lbo_valid = LBER_INITIALIZED;

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

if ( (new = (struct berval *) LBER_MALLOC( sizeof(struct berval) ))
== NULL ) {
return( NULL );
}

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

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

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

return( new );
}


#ifdef STR_TRANSLATION
void
ber_set_string_translators( BerElement *ber, BERTranslateProc encode_proc,
BERTranslateProc decode_proc )
{
assert( ber != NULL );
assert( BER_VALID( ber ) );

ber->ber_encode_translate_proc = encode_proc;
ber->ber_decode_translate_proc = decode_proc;
}	}
#endif /* STR_TRANSLATION */

Removed from v.1.30
changed lines
	Added in v.1.34.6.9