--- libraries/liblber/decode.c 2001/05/06 22:43:39 1.5.2.4.2.3 +++ libraries/liblber/decode.c 1998/10/26 00:18:42 1.6 @@ -1,9 +1,5 @@ /* 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. * All rights reserved. * @@ -18,16 +14,22 @@ #include "portable.h" #include -#include -#include +#ifdef STDC_HEADERS +#include +#include +#else +#include +#endif #include #include -#include "lber.h" +#include "lber-int.h" +#ifdef LDAP_DEBUG int lber_debug; +#endif static int ber_getnint LDAP_P(( BerElement *ber, long *num, int len )); @@ -38,7 +40,7 @@ ber_get_tag( BerElement *ber ) unsigned char xbyte; unsigned long tag; char *tagp; - unsigned int i; + int i; if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 ) return( LBER_DEFAULT ); @@ -114,12 +116,6 @@ ber_skip_tag( BerElement *ber, unsigned *len = lc; } - - /* BER element should have enough data left */ - if( *len > ber->ber_end - ber->ber_ptr ) { - return LBER_DEFAULT; - } - return( tag ); } @@ -196,8 +192,7 @@ ber_get_stringb( BerElement *ber, char * if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) return( LBER_DEFAULT ); - - if ( datalen >= *len ) + if ( datalen > (*len - 1) ) return( LBER_DEFAULT ); if ( (unsigned long) ber_read( ber, buf, datalen ) != datalen ) @@ -233,19 +228,14 @@ ber_get_stringa( BerElement *ber, char * { unsigned long datalen, tag; - if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) { - *buf = NULL; + if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) return( LBER_DEFAULT ); - } if ( (*buf = (char *) malloc( (size_t)datalen + 1 )) == NULL ) return( LBER_DEFAULT ); - if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen ) { - free( *buf ); - *buf = NULL; + if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen ) return( LBER_DEFAULT ); - } (*buf)[datalen] = '\0'; #ifdef STR_TRANSLATION @@ -255,7 +245,6 @@ ber_get_stringa( BerElement *ber, char * if ( (*(ber->ber_decode_translate_proc))( buf, &datalen, 1 ) != 0 ) { free( *buf ); - *buf = NULL; return( LBER_DEFAULT ); } } @@ -269,25 +258,17 @@ ber_get_stringal( BerElement *ber, struc { unsigned long len, tag; - if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) { - *bv = NULL; + if ( (*bv = (struct berval *) malloc( sizeof(struct berval) )) == NULL ) return( LBER_DEFAULT ); - } - if ( (*bv = (struct berval *) malloc( sizeof(struct berval) )) == NULL ) + if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) return( LBER_DEFAULT ); - if ( ((*bv)->bv_val = (char *) malloc( (size_t)len + 1 )) == NULL ) { - free( *bv ); - *bv = NULL; + if ( ((*bv)->bv_val = (char *) malloc( (size_t)len + 1 )) == NULL ) return( LBER_DEFAULT ); - } - if ( (unsigned long) ber_read( ber, (*bv)->bv_val, len ) != len ) { - ber_bvfree( *bv ); - *bv = NULL; + if ( (unsigned long) ber_read( ber, (*bv)->bv_val, len ) != len ) return( LBER_DEFAULT ); - } ((*bv)->bv_val)[len] = '\0'; (*bv)->bv_len = len; @@ -297,8 +278,7 @@ ber_get_stringal( BerElement *ber, struc ++len; if ( (*(ber->ber_decode_translate_proc))( &((*bv)->bv_val), &len, 1 ) != 0 ) { - ber_bvfree( *bv ); - *bv = NULL; + free( (*bv)->bv_val ); return( LBER_DEFAULT ); } (*bv)->bv_len = len - 1; @@ -314,26 +294,18 @@ ber_get_bitstringa( BerElement *ber, cha unsigned long datalen, tag; unsigned char unusedbits; - if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) { - *buf = NULL; + if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) return( LBER_DEFAULT ); - } --datalen; if ( (*buf = (char *) malloc( (size_t)datalen )) == NULL ) return( LBER_DEFAULT ); - if ( ber_read( ber, (char *)&unusedbits, 1 ) != 1 ) { - free( buf ); - *buf = NULL; + if ( ber_read( ber, (char *)&unusedbits, 1 ) != 1 ) return( LBER_DEFAULT ); - } - if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen ) { - free( buf ); - *buf = NULL; + if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen ) return( LBER_DEFAULT ); - } *blen = datalen * 8 - unusedbits; return( tag ); @@ -370,7 +342,6 @@ ber_first_element( BerElement *ber, unsi { /* skip the sequence header, use the len to mark where to stop */ if ( ber_skip_tag( ber, len ) == LBER_DEFAULT ) { - *last = NULL; return( LBER_DEFAULT ); } @@ -396,7 +367,7 @@ ber_next_element( BerElement *ber, unsig /* VARARGS */ unsigned long ber_scanf -#if HAVE_STDARG +#ifdef STDC_HEADERS ( BerElement *ber, char *fmt, ... ) #else ( va_alist ) @@ -404,26 +375,24 @@ va_dcl #endif { va_list ap; -#ifndef HAVE_STDARG +#ifndef STDC_HEADERS BerElement *ber; char *fmt; #endif - char *fmt_reset; char *last; char *s, **ss, ***sss; struct berval ***bv, **bvp, *bval; int *i, j; - long *l; - unsigned long rc, tag, len; + long *l, rc, tag; + unsigned long len; -#ifdef HAVE_STDARG +#if STDC_HEADERS va_start( ap, fmt ); #else va_start( ap ); ber = va_arg( ap, BerElement * ); fmt = va_arg( ap, char * ); #endif - fmt_reset = fmt; #ifdef LDAP_DEBUG if ( lber_debug & 64 ) { @@ -433,8 +402,6 @@ va_dcl #endif for ( rc = 0; *fmt && rc != LBER_DEFAULT; fmt++ ) { - /* When this is modified, remember to update - * the error-cleanup code below accordingly. */ switch ( *fmt ) { case 'a': /* octet string - allocate storage as needed */ ss = va_arg( ap, char ** ); @@ -563,103 +530,6 @@ va_dcl 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 ); }