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.28 and 1.29

version 1.28, 1999/05/28 17:33:05	version 1.29, 1999/05/28 23:19:15
Line 237 ber_get_stringb( BerElement ber, char	Line 237 ber_get_stringb( BerElement ber, char
return( LBER_DEFAULT );	return( LBER_DEFAULT );
}	}
if ( datalen > *len ) {	if ( datalen > *len ) {
free( transbuf );	LBER_FREE( transbuf );
return( LBER_DEFAULT );	return( LBER_DEFAULT );
}	}
SAFEMEMCPY( buf, transbuf, datalen );	SAFEMEMCPY( buf, transbuf, datalen );
free( transbuf );	LBER_FREE( transbuf );
--datalen;	--datalen;
}	}
#endif /* STR_TRANSLATION */	#endif /* STR_TRANSLATION */
Line 265 ber_get_stringa( BerElement ber, char	Line 265 ber_get_stringa( BerElement ber, char
return( LBER_DEFAULT );	return( LBER_DEFAULT );
}	}

if ( (buf = (char ) malloc( (size_t)datalen + 1 )) == NULL )	if ( (buf = (char ) LBER_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 );	LBER_FREE( *buf );
*buf = NULL;	*buf = NULL;
return( LBER_DEFAULT );	return( LBER_DEFAULT );
}	}
Line 281 ber_get_stringa( BerElement ber, char	Line 281 ber_get_stringa( BerElement ber, char
++datalen;	++datalen;
if ( (*(ber->ber_decode_translate_proc))( buf, &datalen, 1 )	if ( (*(ber->ber_decode_translate_proc))( buf, &datalen, 1 )
!= 0 ) {	!= 0 ) {
free( *buf );	LBER_FREE( *buf );
*buf = NULL;	*buf = NULL;
return( LBER_DEFAULT );	return( LBER_DEFAULT );
}	}
Line 306 ber_get_stringal( BerElement *ber, struc	Line 306 ber_get_stringal( BerElement *ber, struc
return( LBER_DEFAULT );	return( LBER_DEFAULT );
}	}

if ( (bv = (struct berval ) malloc( sizeof(struct berval) )) == NULL )	if ( (bv = (struct berval ) LBER_MALLOC( sizeof(struct berval) )) == NULL )
return( LBER_DEFAULT );	return( LBER_DEFAULT );

if ( ((bv)->bv_val = (char ) malloc( (size_t)len + 1 )) == NULL ) {	if ( ((bv)->bv_val = (char ) LBER_MALLOC( (size_t)len + 1 )) == NULL ) {
free( *bv );	LBER_FREE( *bv );
*bv = NULL;	*bv = NULL;
return( LBER_DEFAULT );	return( LBER_DEFAULT );
}	}
Line 358 ber_get_bitstringa( BerElement *ber, cha	Line 358 ber_get_bitstringa( BerElement *ber, cha
}	}
--datalen;	--datalen;

if ( (buf = (char ) malloc( (size_t)datalen )) == NULL )	if ( (buf = (char ) LBER_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 );	LBER_FREE( buf );
*buf = NULL;	*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 );	LBER_FREE( buf );
*buf = NULL;	*buf = NULL;
return( LBER_DEFAULT );	return( LBER_DEFAULT );
}	}
Line 573 va_dcl	Line 573 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 ) )
{	{
if ( *sss == NULL ) {	sss = (char ) LBER_REALLOC( sss,
sss = (char *) malloc(	(j + 2) * sizeof(char *) );
2 * sizeof(char *) );
} else {
sss = (char ) realloc( sss,
(j + 2) * sizeof(char *) );
}
rc = ber_get_stringa( ber, &((*sss)[j]) );	rc = ber_get_stringa( ber, &((*sss)[j]) );
j++;	j++;
}	}
Line 595 va_dcl	Line 591 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 ) )
{	{
if ( *bv == NULL ) {	bv = (struct berval ) LBER_REALLOC( bv,
bv = (struct berval *) malloc(	(j + 2) * sizeof(struct berval *) );
2 * sizeof(struct berval *) );
} else {
bv = (struct berval ) realloc( bv,
(j + 2) * sizeof(struct berval *) );
}
rc = ber_get_stringal( ber, &((*bv)[j]) );	rc = ber_get_stringal( ber, &((*bv)[j]) );
j++;	j++;
}	}
Line 665 va_dcl	Line 657 va_dcl
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 ) {
free( *ss );	LBER_FREE( *ss );
*ss = NULL;	*ss = NULL;
}	}
break;	break;
Line 690 va_dcl	Line 682 va_dcl
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 != NULL ) {	if ( bval->bv_val != NULL ) {
free( bval->bv_val );	LBER_FREE( bval->bv_val );
bval->bv_val = NULL;	bval->bv_val = NULL;
}	}
bval->bv_len = 0;	bval->bv_len = 0;
Line 707 va_dcl	Line 699 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 ** );
if ( *ss ) {	if ( *ss ) {
free( *ss );	LBER_FREE( *ss );
*ss = NULL;	*ss = NULL;
}	}
(va_arg( ap, long )) = 0; /* for length, in bits */	(va_arg( ap, long )) = 0; /* for length, in bits */
Line 717 va_dcl	Line 709 va_dcl
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] );	LBER_FREE( (*sss)[j] );
(*sss)[j] = NULL;	(*sss)[j] = NULL;
}	}
free( *sss );	LBER_FREE( *sss );
*sss = NULL;	*sss = NULL;
}	}
break;	break;
Line 759 ber_bvfree( struct berval *bv )	Line 751 ber_bvfree( struct berval *bv )
assert(bv != NULL); /* bv damn better point to something */	assert(bv != NULL); /* bv damn better point to something */

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

void	void
Line 772 ber_bvecfree( struct berval **bv )	Line 764 ber_bvecfree( struct berval **bv )

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 );	LBER_FREE( (char *) bv );
}	}

struct berval *	struct berval *
Line 787 ber_bvdup(	Line 779 ber_bvdup(
return NULL;	return NULL;
}	}

if ( (new = (struct berval *) malloc( sizeof(struct berval) ))	if ( (new = (struct berval *) LBER_MALLOC( sizeof(struct berval) ))
== NULL ) {	== NULL ) {
return( NULL );	return( NULL );
}	}
Line 798 ber_bvdup(	Line 790 ber_bvdup(
return ( new );	return ( new );
}	}

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

Removed from v.1.28
changed lines
	Added in v.1.29