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.61 and 1.62

version 1.61, 2001/07/21 21:13:05	version 1.62, 2001/11/03 21:07:41
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.60 2001/05/06 17:07:24 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/libraries/liblber/decode.c,v 1.61 2001/07/21 21:13:05 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 590 ber_scanf ( BerElement *ber,	Line 590 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;

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

	if( *sss == NULL ) {
	LBER_MEMFREE( save );
	rc = LBER_DEFAULT;
	goto breakout;
	}

rc = ber_get_stringa( ber, &((*sss)[j]) );	rc = ber_get_stringa( ber, &((*sss)[j]) );
j++;	j++;
}	}
Line 608 ber_scanf ( BerElement *ber,	Line 616 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;

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 ) {
	LBER_MEMFREE( save );
	rc = LBER_DEFAULT;
	goto breakout;
	}

rc = ber_get_stringal( ber, &((*bv)[j]) );	rc = ber_get_stringal( ber, &((*bv)[j]) );
j++;	j++;
}	}
Line 649 ber_scanf ( BerElement *ber,	Line 665 ber_scanf ( BerElement *ber,
}	}
}	}

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

if ( rc == LBER_DEFAULT ) {	if ( rc == LBER_DEFAULT ) {

Removed from v.1.61
changed lines
	Added in v.1.62