--- libraries/liblber/decode.c 1998/08/08 22:43:15 1.1.3.1 +++ libraries/liblber/decode.c 1998/12/22 00:34:02 1.12 @@ -11,45 +11,19 @@ * is provided ``as is'' without express or implied warranty. */ +#include "portable.h" + #include -#ifdef MACOS -#include -#include -#include "macos.h" -#else /* MACOS */ -#if defined(NeXT) || defined(VMS) #include -#else /* next || vms */ -#include -#endif /* next || vms */ -#if defined(BC31) || defined(_WIN32) -#include -#else /* BC31 || _WIN32 */ -#include -#endif /* BC31 || _WIN32 */ -#include -#include -#include -#ifdef PCNFS -#include -#endif /* PCNFS */ -#endif /* MACOS */ - -#if defined( DOS ) || defined( _WIN32 ) -#include "msdos.h" -#endif /* DOS */ - -#include -#include "lber.h" - -#ifdef LDAP_DEBUG -int lber_debug; -#endif - -#ifdef NEEDPROTOS -static int ber_getnint( BerElement *ber, long *num, int len ); -#endif /* NEEDPROTOS */ +#include + +#include +#include + +#include "lber-int.h" + +static int ber_getnint LDAP_P(( BerElement *ber, long *num, int len )); /* return the tag - LBER_DEFAULT returned means trouble */ unsigned long @@ -58,7 +32,7 @@ ber_get_tag( BerElement *ber ) unsigned char xbyte; unsigned long tag; char *tagp; - int i; + unsigned int i; if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 ) return( LBER_DEFAULT ); @@ -129,7 +103,7 @@ ber_skip_tag( BerElement *ber, unsigned if ( ber_read( ber, (char *) &netlen + diff, noctets ) != noctets ) return( LBER_DEFAULT ); - *len = LBER_NTOHL( netlen ); + *len = AC_NTOHL( netlen ); } else { *len = lc; } @@ -155,6 +129,7 @@ ber_getnint( BerElement *ber, long *num, { int diff, sign, i; long netnum; + char *p; /* * The tag and length have already been stripped off. We should @@ -172,14 +147,15 @@ ber_getnint( BerElement *ber, long *num, if ( ber_read( ber, ((char *) &netnum) + diff, len ) != len ) return( -1 ); - /* sign extend if necessary */ - sign = ((0x80 << ((len - 1) * 8)) & netnum); - if ( sign && len < sizeof(long) ) { - for ( i = sizeof(long) - 1; i > len - 1; i-- ) { - netnum |= (0xffL << (i * 8)); + /* sign extend if necessary */ + p = (char *) &netnum; + sign = (0x80 & *(p+diff) ); + if ( sign && len < sizeof(long) ) { + for ( i = 0; i < diff; i++ ) { + *(p+i) = (unsigned char) 0xff; } } - *num = LBER_NTOHL( netnum ); + *num = AC_NTOHL( netnum ); return( len ); } @@ -192,7 +168,7 @@ ber_get_int( BerElement *ber, long *num if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) return( LBER_DEFAULT ); - if ( ber_getnint( ber, num, (int)len ) != len ) + if ( (unsigned long) ber_getnint( ber, num, (int)len ) != len ) return( LBER_DEFAULT ); else return( tag ); @@ -211,7 +187,7 @@ ber_get_stringb( BerElement *ber, char * if ( datalen > (*len - 1) ) return( LBER_DEFAULT ); - if ( ber_read( ber, buf, datalen ) != datalen ) + if ( (unsigned long) ber_read( ber, buf, datalen ) != datalen ) return( LBER_DEFAULT ); buf[datalen] = '\0'; @@ -250,7 +226,7 @@ ber_get_stringa( BerElement *ber, char * if ( (*buf = (char *) malloc( (size_t)datalen + 1 )) == NULL ) return( LBER_DEFAULT ); - if ( ber_read( ber, *buf, datalen ) != datalen ) + if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen ) return( LBER_DEFAULT ); (*buf)[datalen] = '\0'; @@ -283,7 +259,7 @@ ber_get_stringal( BerElement *ber, struc if ( ((*bv)->bv_val = (char *) malloc( (size_t)len + 1 )) == NULL ) return( LBER_DEFAULT ); - if ( ber_read( ber, (*bv)->bv_val, len ) != len ) + if ( (unsigned long) ber_read( ber, (*bv)->bv_val, len ) != len ) return( LBER_DEFAULT ); ((*bv)->bv_val)[len] = '\0'; (*bv)->bv_len = len; @@ -320,7 +296,7 @@ ber_get_bitstringa( BerElement *ber, cha if ( ber_read( ber, (char *)&unusedbits, 1 ) != 1 ) return( LBER_DEFAULT ); - if ( ber_read( ber, *buf, datalen ) != datalen ) + if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen ) return( LBER_DEFAULT ); *blen = datalen * 8 - unusedbits; @@ -364,7 +340,11 @@ ber_first_element( BerElement *ber, unsi *last = ber->ber_ptr + *len; if ( *last == ber->ber_ptr ) { +#ifdef LBER_END_SEQORSET + return( LBER_END_SEQORSET ); +#else return( LBER_DEFAULT ); +#endif } return( ber_peek_tag( ber, len ) ); @@ -374,7 +354,11 @@ unsigned long ber_next_element( BerElement *ber, unsigned long *len, char *last ) { if ( ber->ber_ptr == last ) { +#ifdef LBER_END_SEQORSET + return( LBER_END_SEQORSET ); +#else return( LBER_DEFAULT ); +#endif } return( ber_peek_tag( ber, len ) ); @@ -382,16 +366,16 @@ ber_next_element( BerElement *ber, unsig /* VARARGS */ unsigned long -ber_scanf( -#if defined( MACOS ) || defined( BC31 ) || defined( _WIN32 ) - BerElement *ber, char *fmt, ... ) +ber_scanf +#if HAVE_STDARG + ( BerElement *ber, char *fmt, ... ) #else - va_alist ) + ( va_alist ) va_dcl #endif { va_list ap; -#if !defined( MACOS ) && !defined( BC31 ) && !defined( _WIN32 ) +#ifndef HAVE_STDARG BerElement *ber; char *fmt; #endif @@ -399,10 +383,10 @@ va_dcl char *s, **ss, ***sss; struct berval ***bv, **bvp, *bval; int *i, j; - long *l, rc, tag; - unsigned long len; + long *l; + unsigned long rc, tag, len; -#if defined( MACOS ) || defined( BC31 ) || defined( _WIN32 ) +#ifdef HAVE_STDARG va_start( ap, fmt ); #else va_start( ap ); @@ -410,12 +394,11 @@ va_dcl fmt = va_arg( ap, char * ); #endif -#ifdef LDAP_DEBUG - if ( lber_debug & 64 ) { - fprintf( stderr, "ber_scanf fmt (%s) ber:\n", fmt ); - ber_dump( ber, 1 ); + if ( ber->ber_debug ) { + lber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug, + "ber_scanf fmt (%s) ber:\n", fmt ); + lber_log_dump( LDAP_DEBUG_BER, ber->ber_debug, ber, 1 ); } -#endif for ( rc = 0; *fmt && rc != LBER_DEFAULT; fmt++ ) { switch ( *fmt ) { @@ -482,8 +465,13 @@ va_dcl *sss = NULL; j = 0; for ( tag = ber_first_element( ber, &len, &last ); - tag != LBER_DEFAULT && rc != LBER_DEFAULT; - tag = ber_next_element( ber, &len, last ) ) { + tag != LBER_DEFAULT && +#ifdef LDAP_END_SEQORSET + tag != LBER_END_SEQORSET && +#endif + rc != LBER_DEFAULT; + tag = ber_next_element( ber, &len, last ) ) + { if ( *sss == NULL ) { *sss = (char **) malloc( 2 * sizeof(char *) ); @@ -494,6 +482,13 @@ va_dcl rc = ber_get_stringa( ber, &((*sss)[j]) ); j++; } +#ifdef LDAP_END_SEQORSET + if (rc != LBER_DEFAULT && + tag != LBER_END_SEQORSET ) + { + rc = LBER_DEFAULT; + } +#endif if ( j > 0 ) (*sss)[j] = NULL; break; @@ -503,8 +498,13 @@ va_dcl *bv = NULL; j = 0; for ( tag = ber_first_element( ber, &len, &last ); - tag != LBER_DEFAULT && rc != LBER_DEFAULT; - tag = ber_next_element( ber, &len, last ) ) { + tag != LBER_DEFAULT && +#ifdef LDAP_END_SEQORSET + tag != LBER_END_SEQORSET && +#endif + rc != LBER_DEFAULT; + tag = ber_next_element( ber, &len, last ) ) + { if ( *bv == NULL ) { *bv = (struct berval **) malloc( 2 * sizeof(struct berval *) ); @@ -515,6 +515,13 @@ va_dcl rc = ber_get_stringal( ber, &((*bv)[j]) ); j++; } +#ifdef LDAP_END_SEQORSET + if (rc != LBER_DEFAULT && + tag != LBER_END_SEQORSET ) + { + rc = LBER_DEFAULT; + } +#endif if ( j > 0 ) (*bv)[j] = NULL; break; @@ -536,9 +543,10 @@ va_dcl break; default: -#ifndef NO_USERINTERFACE - fprintf( stderr, "unknown fmt %c\n", *fmt ); -#endif /* NO_USERINTERFACE */ + if( ber->ber_debug ) { + lber_log_printf( LDAP_DEBUG_ANY, ber->ber_debug, + "ber_scanf: unknown fmt %c\n", *fmt ); + } rc = LBER_DEFAULT; break; } @@ -552,6 +560,9 @@ va_dcl void ber_bvfree( struct berval *bv ) { +#ifdef LBER_ASSERT + assert(bv != NULL); /* bv damn better point to something */ +#endif if ( bv->bv_val != NULL ) free( bv->bv_val ); free( (char *) bv ); @@ -562,6 +573,9 @@ ber_bvecfree( struct berval **bv ) { int i; +#ifdef LBER_ASSERT + assert(bv != NULL); /* bv damn better point to something */ +#endif for ( i = 0; bv[i] != NULL; i++ ) ber_bvfree( bv[i] ); free( (char *) bv ); @@ -576,9 +590,18 @@ ber_bvdup( struct berval *bv ) == NULL ) { return( NULL ); } + + if ( bv->bv_val == NULL ) { + new->bv_val = NULL; + new->bv_len = 0; + return ( new ); + } + if ( (new->bv_val = (char *) malloc( bv->bv_len + 1 )) == NULL ) { + 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;