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.3 and 1.6

version 1.5.2.4.2.3, 2001/05/06 22:43:39	version 1.6, 1998/10/26 00:18:42
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 18	Line 14
#include "portable.h"	#include "portable.h"

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

#include <ac/stdarg.h>	#ifdef STDC_HEADERS
	#include <stdlib.h>
	#include <stdarg.h>
	#else
	#include <varargs.h>
	#endif

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

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

	#ifdef LDAP_DEBUG
int lber_debug;	int lber_debug;
	#endif

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 38 ber_get_tag( BerElement *ber )	Line 40 ber_get_tag( BerElement *ber )
unsigned char xbyte;	unsigned char xbyte;
unsigned long tag;	unsigned long tag;
char *tagp;	char *tagp;
unsigned int i;	int i;

if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 )	if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 )
return( LBER_DEFAULT );	return( LBER_DEFAULT );
Line 114 ber_skip_tag( BerElement *ber, unsigned	Line 116 ber_skip_tag( BerElement *ber, unsigned
*len = lc;	*len = lc;
}	}


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

return( tag );	return( tag );
}	}

Line 196 ber_get_stringb( BerElement ber, char	Line 192 ber_get_stringb( BerElement ber, char

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) )
if ( datalen >= *len )
return( LBER_DEFAULT );	return( LBER_DEFAULT );

if ( (unsigned long) ber_read( ber, buf, datalen ) != datalen )	if ( (unsigned long) ber_read( ber, buf, datalen ) != datalen )
Line 233 ber_get_stringa( BerElement ber, char	Line 228 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 255 ber_get_stringa( BerElement ber, char	Line 245 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 269 ber_get_stringal( BerElement *ber, struc	Line 258 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 297 ber_get_stringal( BerElement *ber, struc	Line 278 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 314 ber_get_bitstringa( BerElement *ber, cha	Line 294 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 370 ber_first_element( BerElement *ber, unsi	Line 342 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 );
}	}

Line 396 ber_next_element( BerElement *ber, unsig	Line 367 ber_next_element( BerElement *ber, unsig
/* VARARGS */	/* VARARGS */
unsigned long	unsigned long
ber_scanf	ber_scanf
#if HAVE_STDARG	#ifdef STDC_HEADERS
( BerElement ber, char fmt, ... )	( BerElement ber, char fmt, ... )
#else	#else
( va_alist )	( va_alist )
Line 404 va_dcl	Line 375 va_dcl
#endif	#endif
{	{
va_list ap;	va_list ap;
#ifndef HAVE_STDARG	#ifndef STDC_HEADERS
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;
int *i, j;	int *i, j;
long *l;	long *l, rc, tag;
unsigned long rc, tag, len;	unsigned long len;

#ifdef HAVE_STDARG	#if STDC_HEADERS
va_start( ap, fmt );	va_start( ap, fmt );
#else	#else
va_start( ap );	va_start( ap );
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	#ifdef LDAP_DEBUG
if ( lber_debug & 64 ) {	if ( lber_debug & 64 ) {
Line 433 va_dcl	Line 402 va_dcl
#endif	#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 563 va_dcl	Line 530 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 );
}	}

Removed from v.1.5.2.4.2.3
changed lines
	Added in v.1.6