version 1.61, 2001/07/21 21:13:05
|
version 1.77, 2002/01/04 20:17:36
|
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.60 2001/05/06 17:07:24 kurt Exp $ */ |
/* $OpenLDAP: pkg/ldap/libraries/liblber/decode.c,v 1.76 2002/01/03 19:04:31 kurt Exp $ */ |
/* |
/* |
* Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. |
* Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. |
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file |
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file |
*/ |
*/ |
/* Portions |
/* Portions |
Line 137 ber_skip_tag( BerElement *ber, ber_len_t
|
Line 137 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_pvt_ber_remaining( ber ) ) { |
if( *len > (ber_len_t) ber_pvt_ber_remaining( ber ) ) { |
return LBER_DEFAULT; |
return LBER_DEFAULT; |
} |
} |
|
|
Line 273 ber_get_stringb(
|
Line 278 ber_get_stringb(
|
return tag; |
return tag; |
} |
} |
|
|
|
/* Definitions for recursive get_string |
|
* |
|
* ChArray, BvArray, and BvVec are self-explanatory. |
|
* BvOff is a struct berval embedded in an array of larger structures |
|
* of siz bytes at off bytes from the beginning of the struct. |
|
*/ |
|
enum bgbvc { ChArray, BvArray, BvVec, BvOff }; |
|
|
|
/* Use this single cookie for state, to keep actual |
|
* stack use to the absolute minimum. |
|
*/ |
|
typedef struct bgbvr { |
|
BerElement *ber; |
|
enum bgbvc choice; |
|
ber_tag_t tag; |
|
ber_len_t len; |
|
char *last; |
|
ber_len_t siz; |
|
ber_len_t off; |
|
union { |
|
char ***c; |
|
BVarray *ba; |
|
struct berval ***bv; |
|
} res; |
|
} 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. |
|
*/ |
ber_tag_t |
ber_tag_t |
ber_get_stringa( BerElement *ber, char **buf ) |
ber_get_stringbvr( bgbvr *b, int n ) |
|
{ |
|
struct berval bv, *bvp = NULL; |
|
|
|
if ( n ) |
|
b->tag = ber_next_element( b->ber, &b->len, b->last ); |
|
else |
|
b->tag = ber_first_element( b->ber, &b->len, &b->last ); |
|
|
|
if ( b->tag == LBER_DEFAULT ) |
|
{ |
|
b->len = n; |
|
|
|
if ( n == 0 ) { |
|
*b->res.c = NULL; |
|
return 0; |
|
} |
|
/* 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 |
|
* 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 ) == LBER_DEFAULT ) { |
|
if ( bvp ) LBER_FREE( bvp ); |
|
return LBER_DEFAULT; |
|
} |
|
|
|
b->tag = ber_get_stringbvr( b, n+1 ); |
|
|
|
if ( b->tag == 0 ) |
|
{ |
|
/* store my result */ |
|
switch (b->choice) { |
|
case ChArray: |
|
(*b->res.c)[n] = bv.bv_val; |
|
break; |
|
case BvArray: |
|
(*b->res.ba)[n] = bv; |
|
break; |
|
case BvVec: |
|
(*b->res.bv)[n] = bvp; |
|
*bvp = bv; |
|
break; |
|
case BvOff: |
|
*(BVarray)((long)(*b->res.ba)+n*b->siz+b->off) = bv; |
|
} |
|
} else { |
|
/* Failure will propagate up and free in reverse |
|
* order, which is actually ideal. |
|
*/ |
|
if ( bvp ) LBER_FREE( bvp ); |
|
LBER_FREE( bv.bv_val ); |
|
} |
|
return b->tag; |
|
} |
|
|
|
ber_tag_t |
|
ber_get_stringbv( BerElement *ber, struct berval *bv ) |
{ |
{ |
ber_len_t datalen; |
|
ber_tag_t tag; |
ber_tag_t tag; |
|
|
assert( ber != NULL ); |
assert( ber != NULL ); |
assert( buf != NULL ); |
assert( bv != NULL ); |
|
|
assert( LBER_VALID( ber ) ); |
assert( LBER_VALID( ber ) ); |
|
|
if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) { |
if ( (tag = ber_skip_tag( ber, &bv->bv_len )) == LBER_DEFAULT ) { |
*buf = NULL; |
bv->bv_val = NULL; |
return LBER_DEFAULT; |
return LBER_DEFAULT; |
} |
} |
|
|
if ( (*buf = (char *) LBER_MALLOC( datalen + 1 )) == NULL ) { |
if ( (bv->bv_val = (char *) LBER_MALLOC( bv->bv_len + 1 )) == NULL ) { |
return LBER_DEFAULT; |
return LBER_DEFAULT; |
} |
} |
|
|
if ( (ber_len_t) ber_read( ber, *buf, datalen ) != datalen ) { |
if ( bv->bv_len > 0 && (ber_len_t) ber_read( ber, bv->bv_val, |
LBER_FREE( *buf ); |
bv->bv_len ) != bv->bv_len ) { |
*buf = NULL; |
LBER_FREE( bv->bv_val ); |
|
bv->bv_val = NULL; |
return LBER_DEFAULT; |
return LBER_DEFAULT; |
} |
} |
(*buf)[datalen] = '\0'; |
bv->bv_val[bv->bv_len] = '\0'; |
|
|
|
return tag; |
|
} |
|
|
|
ber_tag_t |
|
ber_get_stringa( BerElement *ber, char **buf ) |
|
{ |
|
BerValue bv; |
|
ber_tag_t tag; |
|
|
|
assert( buf != NULL ); |
|
|
|
tag = ber_get_stringbv( ber, &bv ); |
|
*buf = bv.bv_val; |
|
|
return tag; |
return tag; |
} |
} |
Line 306 ber_get_stringa( BerElement *ber, char *
|
Line 444 ber_get_stringa( BerElement *ber, char *
|
ber_tag_t |
ber_tag_t |
ber_get_stringal( BerElement *ber, struct berval **bv ) |
ber_get_stringal( BerElement *ber, struct berval **bv ) |
{ |
{ |
ber_len_t len; |
|
ber_tag_t tag; |
ber_tag_t tag; |
|
|
assert( ber != NULL ); |
assert( ber != NULL ); |
assert( bv != NULL ); |
assert( bv != NULL ); |
|
|
assert( LBER_VALID( ber ) ); |
|
|
|
if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) { |
|
*bv = NULL; |
|
return LBER_DEFAULT; |
|
} |
|
|
|
*bv = (struct berval *) LBER_MALLOC( sizeof(struct berval) ); |
*bv = (struct berval *) LBER_MALLOC( sizeof(struct berval) ); |
if ( *bv == NULL ) { |
if ( *bv == NULL ) { |
return LBER_DEFAULT; |
return LBER_DEFAULT; |
} |
} |
|
|
if( len == 0 ) { |
tag = ber_get_stringbv( ber, *bv ); |
(*bv)->bv_val = NULL; |
if ( tag == LBER_DEFAULT ) { |
(*bv)->bv_len = 0; |
|
return tag; |
|
} |
|
|
|
(*bv)->bv_val = (char *) LBER_MALLOC( len + 1 ); |
|
if ( (*bv)->bv_val == NULL ) { |
|
LBER_FREE( *bv ); |
LBER_FREE( *bv ); |
*bv = NULL; |
*bv = NULL; |
return LBER_DEFAULT; |
|
} |
} |
|
|
if ( (ber_len_t) ber_read( ber, (*bv)->bv_val, len ) != len ) { |
|
ber_bvfree( *bv ); |
|
*bv = NULL; |
|
return LBER_DEFAULT; |
|
} |
|
|
|
((*bv)->bv_val)[len] = '\0'; |
|
(*bv)->bv_len = len; |
|
|
|
return tag; |
return tag; |
} |
} |
|
|
Line 482 ber_scanf ( BerElement *ber,
|
Line 595 ber_scanf ( BerElement *ber,
|
{ |
{ |
va_list ap; |
va_list ap; |
LDAP_CONST char *fmt_reset; |
LDAP_CONST char *fmt_reset; |
|
char *s, **ss; |
|
#ifdef TMP_SLOTS |
char *last; |
char *last; |
char *s, **ss, ***sss; |
char ***sss; |
struct berval ***bv, **bvp, *bval; |
ber_tag_t tag; |
ber_int_t *i; |
struct berval ***bv; |
int j; |
int j; |
|
#endif |
|
struct berval **bvp, *bval; |
|
ber_int_t *i; |
ber_len_t *l; |
ber_len_t *l; |
ber_tag_t *t; |
ber_tag_t *t; |
ber_tag_t rc, tag; |
ber_tag_t rc; |
ber_len_t len; |
ber_len_t len; |
|
|
va_start( ap, fmt ); |
va_start( ap, fmt ); |
Line 557 ber_scanf ( BerElement *ber,
|
Line 675 ber_scanf ( BerElement *ber,
|
|
|
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 * ); |
ber_peek_tag( ber, &bval->bv_len ); |
rc = ber_get_stringbv( ber, bval ); |
rc = ber_get_stringa( ber, &bval->bv_val ); |
|
break; |
break; |
|
|
case 'O': /* octet string - allocate & include length */ |
case 'O': /* octet string - allocate & include length */ |
Line 583 ber_scanf ( BerElement *ber,
|
Line 700 ber_scanf ( BerElement *ber,
|
break; |
break; |
|
|
case 'v': /* sequence of strings */ |
case 'v': /* sequence of strings */ |
sss = va_arg( ap, char *** ); |
{ |
*sss = NULL; |
bgbvr cookie = { ber, ChArray }; |
j = 0; |
cookie.res.c = va_arg( ap, char *** ); |
for ( tag = ber_first_element( ber, &len, &last ); |
rc = ber_get_stringbvr( &cookie, 0 ); |
tag != LBER_DEFAULT && rc != LBER_DEFAULT; |
|
tag = ber_next_element( ber, &len, last ) ) |
|
{ |
|
*sss = (char **) LBER_REALLOC( *sss, |
|
(j + 2) * sizeof(char *) ); |
|
|
|
rc = ber_get_stringa( ber, &((*sss)[j]) ); |
|
j++; |
|
} |
|
if ( j > 0 ) |
|
(*sss)[j] = NULL; |
|
break; |
break; |
|
} |
|
|
case 'V': /* sequence of strings + lengths */ |
case 'V': /* sequence of strings + lengths */ |
bv = va_arg( ap, struct berval *** ); |
{ |
*bv = NULL; |
bgbvr cookie = { ber, BvVec }; |
j = 0; |
cookie.res.bv = va_arg( ap, struct berval *** ); |
for ( tag = ber_first_element( ber, &len, &last ); |
rc = ber_get_stringbvr( &cookie, 0 ); |
tag != LBER_DEFAULT && rc != LBER_DEFAULT; |
break; |
tag = ber_next_element( ber, &len, last ) ) |
} |
{ |
|
*bv = (struct berval **) LBER_REALLOC( *bv, |
case 'W': /* bvarray */ |
(j + 2) * sizeof(struct berval *) ); |
{ |
|
bgbvr cookie = { ber, BvArray }; |
rc = ber_get_stringal( ber, &((*bv)[j]) ); |
cookie.res.ba = va_arg( ap, struct berval ** ); |
j++; |
rc = ber_get_stringbvr( &cookie, 0 ); |
} |
break; |
if ( j > 0 ) |
} |
(*bv)[j] = NULL; |
|
|
case 'w': /* bvoffarray - must include address of |
|
* a record len, and record offset. |
|
* number of records will be returned thru |
|
* len ptr on finish. |
|
*/ |
|
{ |
|
bgbvr cookie = { ber, BvOff }; |
|
cookie.res.ba = va_arg( ap, struct berval ** ); |
|
l = va_arg( ap, ber_len_t * ); |
|
cookie.siz = *l; |
|
cookie.off = va_arg( ap, ber_len_t ); |
|
rc = ber_get_stringbvr( &cookie, 0 ); |
|
*l = cookie.len; |
break; |
break; |
|
} |
|
|
case 'x': /* skip the next element - whatever it is */ |
case 'x': /* skip the next element - whatever it is */ |
if ( (rc = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) |
if ( (rc = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) |
Line 626 ber_scanf ( BerElement *ber,
|
Line 747 ber_scanf ( BerElement *ber,
|
|
|
case '{': /* begin sequence */ |
case '{': /* begin sequence */ |
case '[': /* begin set */ |
case '[': /* begin set */ |
if ( *(fmt + 1) != 'v' && *(fmt + 1) != 'V' ) |
if ( *(fmt + 1) != 'v' && *(fmt + 1) != 'V' |
|
&& *(fmt + 1) != 'W' && *(fmt + 1) != 'w' ) |
rc = ber_skip_tag( ber, &len ); |
rc = ber_skip_tag( ber, &len ); |
break; |
break; |
|
|
Line 638 ber_scanf ( BerElement *ber,
|
Line 760 ber_scanf ( BerElement *ber,
|
if( ber->ber_debug ) { |
if( ber->ber_debug ) { |
#ifdef NEW_LOGGING |
#ifdef NEW_LOGGING |
LDAP_LOG(( "liblber", LDAP_LEVEL_ERR, |
LDAP_LOG(( "liblber", LDAP_LEVEL_ERR, |
"ber_scanf: unknown fmt %c\n", *fmt )); |
"ber_scanf: unknown fmt %c\n", *fmt )); |
#else |
#else |
ber_log_printf( LDAP_DEBUG_ANY, ber->ber_debug, |
ber_log_printf( LDAP_DEBUG_ANY, ber->ber_debug, |
"ber_scanf: unknown fmt %c\n", *fmt ); |
"ber_scanf: unknown fmt %c\n", *fmt ); |
Line 650 ber_scanf ( BerElement *ber,
|
Line 772 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. |
Line 725 ber_scanf ( BerElement *ber,
|
Line 846 ber_scanf ( BerElement *ber,
|
break; |
break; |
|
|
case 'v': /* sequence of strings */ |
case 'v': /* sequence of strings */ |
sss = va_arg( ap, char *** ); |
|
if ( *sss ) { |
|
for (j = 0; (*sss)[j]; j++) { |
|
LBER_FREE( (*sss)[j] ); |
|
(*sss)[j] = NULL; |
|
} |
|
LBER_FREE( *sss ); |
|
*sss = NULL; |
|
} |
|
break; |
|
|
|
case 'V': /* sequence of strings + lengths */ |
case 'V': /* sequence of strings + lengths */ |
bv = va_arg( ap, struct berval *** ); |
case 'W': /* BVarray */ |
if ( *bv ) { |
|
ber_bvecfree( *bv ); |
|
*bv = NULL; |
|
} |
|
break; |
|
|
|
case 'n': /* null */ |
case 'n': /* null */ |
case 'x': /* skip the next element - whatever it is */ |
case 'x': /* skip the next element - whatever it is */ |
case '{': /* begin sequence */ |
case '{': /* begin sequence */ |