version 1.85, 2002/07/11 18:33:24
|
version 1.96.2.1, 2003/09/18 15:43:31
|
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.84 2002/01/14 00:43:18 hyc Exp $ */ |
/* $OpenLDAP: pkg/ldap/libraries/liblber/decode.c,v 1.97 2003/07/08 01:46:20 kurt Exp $ */ |
/* |
/* |
* Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. |
* Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. |
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file |
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file |
*/ |
*/ |
/* Portions |
/* Portions |
Line 48 ber_get_tag( BerElement *ber )
|
Line 48 ber_get_tag( BerElement *ber )
|
return LBER_DEFAULT; |
return LBER_DEFAULT; |
} |
} |
|
|
if ( ber->ber_ptr == ber->ber_buf ) |
if ( ber->ber_ptr == ber->ber_buf ) { |
tag = *(unsigned char *)ber->ber_ptr; |
tag = *(unsigned char *)ber->ber_ptr; |
else |
} else { |
tag = ber->ber_tag; |
tag = ber->ber_tag; |
|
} |
ber->ber_ptr++; |
ber->ber_ptr++; |
|
|
if ( (tag & LBER_BIG_TAG_MASK) != LBER_BIG_TAG_MASK ) { |
if ( (tag & LBER_BIG_TAG_MASK) != LBER_BIG_TAG_MASK ) { |
Line 118 ber_skip_tag( BerElement *ber, ber_len_t
|
Line 119 ber_skip_tag( BerElement *ber, ber_len_t
|
* greater than what we can hold in a ber_len_t. |
* greater than what we can hold in a ber_len_t. |
*/ |
*/ |
|
|
if ( ber_read( ber, (char *) &lc, 1 ) != 1 ) |
if ( ber_read( ber, (char *) &lc, 1 ) != 1 ) { |
return LBER_DEFAULT; |
return LBER_DEFAULT; |
|
} |
|
|
if ( lc & 0x80U ) { |
if ( lc & 0x80U ) { |
noctets = (lc & 0x7fU); |
noctets = (lc & 0x7fU); |
Line 128 ber_skip_tag( BerElement *ber, ber_len_t
|
Line 130 ber_skip_tag( BerElement *ber, ber_len_t
|
return LBER_DEFAULT; |
return LBER_DEFAULT; |
} |
} |
|
|
if( (unsigned) ber_read( ber, netlen, noctets ) != noctets ) { |
if( (unsigned) ber_read( ber, (char *) netlen, noctets ) != noctets ) { |
return LBER_DEFAULT; |
return LBER_DEFAULT; |
} |
} |
|
|
Line 141 ber_skip_tag( BerElement *ber, ber_len_t
|
Line 143 ber_skip_tag( BerElement *ber, ber_len_t
|
*len = lc; |
*len = lc; |
} |
} |
|
|
/* BER length should be non-negative */ |
|
if( *len < 0 ) { |
|
return LBER_DEFAULT; |
|
} |
|
|
|
/* BER element should have enough data left */ |
/* BER element should have enough data left */ |
if( *len > (ber_len_t) ber_pvt_ber_remaining( ber ) ) { |
if( *len > (ber_len_t) ber_pvt_ber_remaining( ber ) ) { |
return LBER_DEFAULT; |
return LBER_DEFAULT; |
Line 287 ber_get_stringb(
|
Line 284 ber_get_stringb(
|
return tag; |
return tag; |
} |
} |
|
|
/* Definitions for recursive get_string |
/* Definitions for get_string vector |
* |
* |
* ChArray, BvArray, and BvVec are self-explanatory. |
* ChArray, BvArray, and BvVec are self-explanatory. |
* BvOff is a struct berval embedded in an array of larger structures |
* BvOff is a struct berval embedded in an array of larger structures |
Line 301 enum bgbvc { ChArray, BvArray, BvVec, Bv
|
Line 298 enum bgbvc { ChArray, BvArray, BvVec, Bv
|
typedef struct bgbvr { |
typedef struct bgbvr { |
enum bgbvc choice; |
enum bgbvc choice; |
BerElement *ber; |
BerElement *ber; |
ber_tag_t tag; |
|
ber_len_t len; |
|
char *last; |
|
int alloc; |
int alloc; |
ber_len_t siz; |
ber_len_t siz; |
ber_len_t off; |
ber_len_t off; |
Line 314 typedef struct bgbvr {
|
Line 308 typedef struct bgbvr {
|
} res; |
} res; |
} bgbvr; |
} bgbvr; |
|
|
/* Recursive get_string, for decoding a vector of strings. The number |
|
* of elements in the vector is limited only by available stack space. |
|
* Each invocation consumes 24 bytes of stack on a 32-bit machine. |
|
*/ |
|
static ber_tag_t |
static ber_tag_t |
ber_get_stringbvr( bgbvr *b, int n ) |
ber_get_stringbvl( bgbvr *b, ber_len_t *rlen ) |
{ |
{ |
|
int i = 0, n; |
|
ber_tag_t tag; |
|
ber_len_t len; |
|
char *last, *orig; |
struct berval bv, *bvp = NULL; |
struct berval bv, *bvp = NULL; |
|
|
if ( n ) |
/* For rewinding, just like ber_peek_tag() */ |
b->tag = ber_next_element( b->ber, &b->len, b->last ); |
orig = b->ber->ber_ptr; |
else |
tag = b->ber->ber_tag; |
b->tag = ber_first_element( b->ber, &b->len, &b->last ); |
|
|
|
if ( b->tag == LBER_DEFAULT ) |
|
{ |
|
b->len = n; |
|
|
|
if ( n == 0 ) { |
if ( ber_first_element( b->ber, &len, &last ) != LBER_DEFAULT ) { |
*b->res.c = NULL; |
for ( ; b->ber->ber_ptr < last; i++ ) { |
return 0; |
if (ber_skip_tag( b->ber, &len ) == LBER_DEFAULT) break; |
|
b->ber->ber_ptr += len; |
|
b->ber->ber_tag = *(unsigned char *)b->ber->ber_ptr; |
} |
} |
/* Allocate the result vector */ |
|
switch (b->choice) { |
|
case ChArray: |
|
*b->res.c = LBER_MALLOC( (n+1) * sizeof( char * )); |
|
if ( *b->res.c == NULL ) |
|
return LBER_DEFAULT; |
|
(*b->res.c)[n] = NULL; |
|
break; |
|
case BvArray: |
|
*b->res.ba = LBER_MALLOC( (n+1) * sizeof( struct berval )); |
|
if ( *b->res.ba == NULL ) |
|
return LBER_DEFAULT; |
|
(*b->res.ba)[n].bv_val = NULL; |
|
break; |
|
case BvVec: |
|
*b->res.bv = LBER_MALLOC( (n+1) * sizeof( struct berval *)); |
|
if ( *b->res.bv == NULL ) |
|
return LBER_DEFAULT; |
|
(*b->res.bv)[n] = NULL; |
|
break; |
|
case BvOff: |
|
*b->res.ba = LBER_MALLOC( (n+1) * b->siz ); |
|
if ( *b->res.ba == NULL ) |
|
return LBER_DEFAULT; |
|
((struct berval *)((long)(*b->res.ba) + n*b->siz + |
|
b->off))->bv_val = NULL; |
|
break; |
|
} |
|
return 0; |
|
} |
} |
|
|
/* Do all local allocs before the recursion. Then there |
if ( rlen ) *rlen = i; |
* cannot possibly be any failures on the return trip. |
|
*/ |
|
if ( b->choice == BvVec ) |
|
bvp = LBER_MALLOC( sizeof( struct berval )); |
|
|
|
if ( ber_get_stringbv( b->ber, &bv, b->alloc ) == LBER_DEFAULT ) { |
if ( i == 0 ) { |
if ( bvp ) LBER_FREE( bvp ); |
*b->res.c = NULL; |
return LBER_DEFAULT; |
return 0; |
} |
} |
|
|
b->tag = ber_get_stringbvr( b, n+1 ); |
n = i; |
|
|
|
/* Allocate the result vector */ |
|
switch (b->choice) { |
|
case ChArray: |
|
*b->res.c = ber_memalloc_x( (n+1)*sizeof( char * ), |
|
b->ber->ber_memctx); |
|
if ( *b->res.c == NULL ) return LBER_DEFAULT; |
|
(*b->res.c)[n] = NULL; |
|
break; |
|
case BvArray: |
|
*b->res.ba = ber_memalloc_x( (n+1)*sizeof( struct berval ), |
|
b->ber->ber_memctx); |
|
if ( *b->res.ba == NULL ) return LBER_DEFAULT; |
|
(*b->res.ba)[n].bv_val = NULL; |
|
break; |
|
case BvVec: |
|
*b->res.bv = ber_memalloc_x( (n+1)*sizeof( struct berval *), |
|
b->ber->ber_memctx); |
|
if ( *b->res.bv == NULL ) return LBER_DEFAULT; |
|
(*b->res.bv)[n] = NULL; |
|
break; |
|
case BvOff: |
|
*b->res.ba = ber_memalloc_x( (n+1) * b->siz, b->ber->ber_memctx ); |
|
if ( *b->res.ba == NULL ) return LBER_DEFAULT; |
|
((struct berval *)((long)(*b->res.ba) + n*b->siz + |
|
b->off))->bv_val = NULL; |
|
break; |
|
} |
|
b->ber->ber_ptr = orig; |
|
b->ber->ber_tag = tag; |
|
ber_skip_tag( b->ber, &len ); |
|
|
if ( b->tag == 0 ) |
for (n=0; n<i; n++) |
{ |
{ |
|
tag = ber_next_element( b->ber, &len, last ); |
|
if ( ber_get_stringbv( b->ber, &bv, b->alloc ) == LBER_DEFAULT ) { |
|
goto nomem; |
|
} |
|
|
/* store my result */ |
/* store my result */ |
switch (b->choice) { |
switch (b->choice) { |
case ChArray: |
case ChArray: |
Line 391 ber_get_stringbvr( bgbvr *b, int n )
|
Line 385 ber_get_stringbvr( bgbvr *b, int n )
|
(*b->res.ba)[n] = bv; |
(*b->res.ba)[n] = bv; |
break; |
break; |
case BvVec: |
case BvVec: |
|
bvp = ber_memalloc_x( sizeof( struct berval ), b->ber->ber_memctx); |
|
if ( !bvp ) { |
|
LBER_FREE(bv.bv_val); |
|
goto nomem; |
|
} |
(*b->res.bv)[n] = bvp; |
(*b->res.bv)[n] = bvp; |
*bvp = bv; |
*bvp = bv; |
break; |
break; |
case BvOff: |
case BvOff: |
*(BerVarray)((long)(*b->res.ba)+n*b->siz+b->off) = bv; |
*(BerVarray)((long)(*b->res.ba)+n*b->siz+b->off) = bv; |
|
break; |
|
} |
|
} |
|
return tag; |
|
|
|
nomem: |
|
if (b->alloc || b->choice == BvVec) { |
|
for (--n; n>=0; n--) { |
|
switch(b->choice) { |
|
case ChArray: |
|
LBER_FREE((*b->res.c)[n]); |
|
break; |
|
case BvArray: |
|
LBER_FREE((*b->res.ba)[n].bv_val); |
|
break; |
|
case BvVec: |
|
LBER_FREE((*b->res.bv)[n]->bv_val); |
|
LBER_FREE((*b->res.bv)[n]); |
|
break; |
|
default: |
|
break; |
|
} |
} |
} |
} else { |
|
/* Failure will propagate up and free in reverse |
|
* order, which is actually ideal. |
|
*/ |
|
if ( b->alloc ) LBER_FREE( bv.bv_val ); |
|
if ( bvp ) LBER_FREE( bvp ); |
|
} |
} |
return b->tag; |
LBER_FREE(*b->res.c); |
|
*b->res.c = NULL; |
|
return LBER_DEFAULT; |
} |
} |
|
|
ber_tag_t |
ber_tag_t |
Line 427 ber_get_stringbv( BerElement *ber, struc
|
Line 444 ber_get_stringbv( BerElement *ber, struc
|
} |
} |
|
|
if ( alloc ) { |
if ( alloc ) { |
if ( (bv->bv_val = (char *) LBER_MALLOC( bv->bv_len + 1 )) == NULL ) { |
bv->bv_val = (char *) ber_memalloc_x( bv->bv_len + 1, |
|
ber->ber_memctx ); |
|
if ( bv->bv_val == NULL ) { |
return LBER_DEFAULT; |
return LBER_DEFAULT; |
} |
} |
|
|
if ( bv->bv_len > 0 && (ber_len_t) ber_read( ber, bv->bv_val, |
if ( bv->bv_len > 0 && (ber_len_t) ber_read( ber, bv->bv_val, |
bv->bv_len ) != bv->bv_len ) { |
bv->bv_len ) != bv->bv_len ) |
|
{ |
LBER_FREE( bv->bv_val ); |
LBER_FREE( bv->bv_val ); |
bv->bv_val = NULL; |
bv->bv_val = NULL; |
return LBER_DEFAULT; |
return LBER_DEFAULT; |
Line 469 ber_get_stringal( BerElement *ber, struc
|
Line 489 ber_get_stringal( BerElement *ber, struc
|
assert( ber != NULL ); |
assert( ber != NULL ); |
assert( bv != NULL ); |
assert( bv != NULL ); |
|
|
*bv = (struct berval *) LBER_MALLOC( sizeof(struct berval) ); |
*bv = (struct berval *) ber_memalloc_x( sizeof(struct berval), |
|
ber->ber_memctx ); |
if ( *bv == NULL ) { |
if ( *bv == NULL ) { |
return LBER_DEFAULT; |
return LBER_DEFAULT; |
} |
} |
Line 504 ber_get_bitstringa(
|
Line 525 ber_get_bitstringa(
|
} |
} |
--datalen; |
--datalen; |
|
|
if ( (*buf = (char *) LBER_MALLOC( datalen )) == NULL ) { |
*buf = (char *) ber_memalloc_x( datalen, ber->ber_memctx ); |
|
if ( *buf == NULL ) { |
return LBER_DEFAULT; |
return LBER_DEFAULT; |
} |
} |
|
|
Line 603 ber_next_element(
|
Line 625 ber_next_element(
|
|
|
assert( LBER_VALID( ber ) ); |
assert( LBER_VALID( ber ) ); |
|
|
if ( ber->ber_ptr == last ) { |
if ( ber->ber_ptr >= last ) { |
return LBER_DEFAULT; |
return LBER_DEFAULT; |
} |
} |
|
|
Line 619 ber_scanf ( BerElement *ber,
|
Line 641 ber_scanf ( BerElement *ber,
|
va_list ap; |
va_list ap; |
LDAP_CONST char *fmt_reset; |
LDAP_CONST char *fmt_reset; |
char *s, **ss; |
char *s, **ss; |
#ifdef TMP_SLOTS |
|
char *last; |
|
char ***sss; |
|
ber_tag_t tag; |
|
struct berval ***bv; |
|
int j; |
|
#endif |
|
struct berval **bvp, *bval; |
struct berval **bvp, *bval; |
ber_int_t *i; |
ber_int_t *i; |
ber_len_t *l; |
ber_len_t *l; |
Line 645 ber_scanf ( BerElement *ber,
|
Line 660 ber_scanf ( BerElement *ber,
|
#ifdef NEW_LOGGING |
#ifdef NEW_LOGGING |
LDAP_LOG( BER, ENTRY, "ber_scanf fmt (%s) ber:\n", fmt, 0, 0 ); |
LDAP_LOG( BER, ENTRY, "ber_scanf fmt (%s) ber:\n", fmt, 0, 0 ); |
|
|
if ( LDAP_LOGS_TEST(BER, DETAIL2 )) |
if ( LDAP_LOGS_TEST(BER, DETAIL2 )) { |
BER_DUMP(( "liblber", LDAP_LEVEL_DETAIL2, ber, 1 )); |
BER_DUMP(( "liblber", LDAP_LEVEL_DETAIL2, ber, 1 )); |
|
} |
#else |
#else |
ber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug, |
ber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug, |
"ber_scanf fmt (%s) ber:\n", fmt ); |
"ber_scanf fmt (%s) ber:\n", fmt ); |
Line 735 ber_scanf ( BerElement *ber,
|
Line 751 ber_scanf ( BerElement *ber,
|
cookie.ber = ber; |
cookie.ber = ber; |
cookie.res.c = va_arg( ap, char *** ); |
cookie.res.c = va_arg( ap, char *** ); |
cookie.alloc = 1; |
cookie.alloc = 1; |
rc = ber_get_stringbvr( &cookie, 0 ); |
rc = ber_get_stringbvl( &cookie, NULL ); |
break; |
break; |
} |
} |
|
|
Line 745 ber_scanf ( BerElement *ber,
|
Line 761 ber_scanf ( BerElement *ber,
|
cookie.ber = ber; |
cookie.ber = ber; |
cookie.res.bv = va_arg( ap, struct berval *** ); |
cookie.res.bv = va_arg( ap, struct berval *** ); |
cookie.alloc = 1; |
cookie.alloc = 1; |
rc = ber_get_stringbvr( &cookie, 0 ); |
rc = ber_get_stringbvl( &cookie, NULL ); |
break; |
break; |
} |
} |
|
|
Line 755 ber_scanf ( BerElement *ber,
|
Line 771 ber_scanf ( BerElement *ber,
|
cookie.ber = ber; |
cookie.ber = ber; |
cookie.res.ba = va_arg( ap, struct berval ** ); |
cookie.res.ba = va_arg( ap, struct berval ** ); |
cookie.alloc = 1; |
cookie.alloc = 1; |
rc = ber_get_stringbvr( &cookie, 0 ); |
rc = ber_get_stringbvl( &cookie, NULL ); |
break; |
break; |
} |
} |
|
|
Line 772 ber_scanf ( BerElement *ber,
|
Line 788 ber_scanf ( BerElement *ber,
|
l = va_arg( ap, ber_len_t * ); |
l = va_arg( ap, ber_len_t * ); |
cookie.siz = *l; |
cookie.siz = *l; |
cookie.off = va_arg( ap, ber_len_t ); |
cookie.off = va_arg( ap, ber_len_t ); |
rc = ber_get_stringbvr( &cookie, 0 ); |
rc = ber_get_stringbvl( &cookie, l ); |
*l = cookie.len; |
|
break; |
break; |
} |
} |
|
|
Line 812 ber_scanf ( BerElement *ber,
|
Line 827 ber_scanf ( BerElement *ber,
|
|
|
va_end( ap ); |
va_end( ap ); |
if ( rc == LBER_DEFAULT ) { |
if ( rc == LBER_DEFAULT ) { |
/* |
/* |
* Error. Reclaim malloced memory that was given to the caller. |
* Error. Reclaim malloced memory that was given to the caller. |
* Set allocated pointers to NULL, "data length" outvalues to 0. |
* Set allocated pointers to NULL, "data length" outvalues to 0. |
*/ |
*/ |
va_start( ap, fmt ); |
va_start( ap, fmt ); |
|
|
for ( ; fmt_reset < fmt; fmt_reset++ ) { |
for ( ; fmt_reset < fmt; fmt_reset++ ) { |
switch ( *fmt_reset ) { |
switch ( *fmt_reset ) { |
case '!': { /* Hook */ |
case '!': { /* Hook */ |
BERDecodeCallback *f; |
BERDecodeCallback *f; |
Line 901 ber_scanf ( BerElement *ber,
|
Line 916 ber_scanf ( BerElement *ber,
|
/* format should be good */ |
/* format should be good */ |
assert( 0 ); |
assert( 0 ); |
} |
} |
} |
} |
|
|
va_end( ap ); |
va_end( ap ); |
} |
} |
|
|
return rc; |
return rc; |