version 1.13, 1998/12/26 08:05:57
|
version 1.26, 1999/05/20 19:53:56
|
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 34 ber_get_tag( BerElement *ber )
|
Line 38 ber_get_tag( BerElement *ber )
|
char *tagp; |
char *tagp; |
unsigned int i; |
unsigned int i; |
|
|
|
assert( ber != NULL ); |
|
|
if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 ) |
if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 ) |
return( LBER_DEFAULT ); |
return( LBER_DEFAULT ); |
|
|
Line 65 ber_skip_tag( BerElement *ber, unsigned
|
Line 71 ber_skip_tag( BerElement *ber, unsigned
|
{ |
{ |
unsigned long tag; |
unsigned long tag; |
unsigned char lc; |
unsigned char lc; |
int noctets, diff; |
unsigned int noctets; |
|
int diff; |
unsigned long netlen; |
unsigned long netlen; |
|
|
|
assert( ber != NULL ); |
|
assert( len != NULL ); |
|
|
/* |
/* |
* Any ber element looks like this: tag length contents. |
* Any ber element looks like this: tag length contents. |
* Assuming everything's ok, we return the tag byte (we |
* Assuming everything's ok, we return the tag byte (we |
Line 95 ber_skip_tag( BerElement *ber, unsigned
|
Line 105 ber_skip_tag( BerElement *ber, unsigned
|
*len = netlen = 0; |
*len = netlen = 0; |
if ( ber_read( ber, (char *) &lc, 1 ) != 1 ) |
if ( ber_read( ber, (char *) &lc, 1 ) != 1 ) |
return( LBER_DEFAULT ); |
return( LBER_DEFAULT ); |
if ( lc & 0x80 ) { |
if ( lc & 0x80U ) { |
noctets = (lc & 0x7f); |
noctets = (lc & 0x7fU); |
if ( noctets > sizeof(unsigned long) ) |
if ( (unsigned) noctets > sizeof(unsigned long) ) |
return( LBER_DEFAULT ); |
return( LBER_DEFAULT ); |
diff = sizeof(unsigned long) - noctets; |
diff = sizeof(unsigned long) - noctets; |
if ( ber_read( ber, (char *) &netlen + diff, noctets ) |
if ( (unsigned) ber_read( ber, (char *) &netlen + diff, noctets ) |
!= noctets ) |
!= noctets ) |
return( LBER_DEFAULT ); |
return( LBER_DEFAULT ); |
*len = AC_NTOHL( netlen ); |
*len = AC_NTOHL( netlen ); |
Line 112 ber_skip_tag( BerElement *ber, unsigned
|
Line 122 ber_skip_tag( BerElement *ber, unsigned
|
} |
} |
|
|
unsigned long |
unsigned long |
ber_peek_tag( BerElement *ber, unsigned long *len ) |
ber_peek_tag( |
|
LDAP_CONST BerElement *ber_in, /* not const per c-api-02 */ |
|
unsigned long *len ) |
{ |
{ |
char *save; |
|
unsigned long tag; |
unsigned long tag; |
|
BerElement *ber; |
|
|
|
assert( ber_in != NULL ); |
|
|
|
ber = ber_dup( ber_in ); |
|
|
|
if( ber == NULL ) { |
|
return LBER_ERROR; |
|
} |
|
|
save = ber->ber_ptr; |
|
tag = ber_skip_tag( ber, len ); |
tag = ber_skip_tag( ber, len ); |
ber->ber_ptr = save; |
|
|
|
|
ber_free( ber, 0 ); |
return( tag ); |
return( tag ); |
} |
} |
|
|
Line 131 ber_getnint( BerElement *ber, long *num,
|
Line 150 ber_getnint( BerElement *ber, long *num,
|
long netnum; |
long netnum; |
char *p; |
char *p; |
|
|
|
assert( ber != NULL ); |
|
assert( num != NULL ); |
|
|
/* |
/* |
* The tag and length have already been stripped off. We should |
* The tag and length have already been stripped off. We should |
* be sitting right before len bytes of 2's complement integer, |
* be sitting right before len bytes of 2's complement integer, |
Line 138 ber_getnint( BerElement *ber, long *num,
|
Line 160 ber_getnint( BerElement *ber, long *num,
|
* extend after we read it in. |
* extend after we read it in. |
*/ |
*/ |
|
|
if ( len > sizeof(long) ) |
if ( (unsigned) len > sizeof(long) ) |
return( -1 ); |
return( -1 ); |
|
|
netnum = 0; |
netnum = 0; |
Line 150 ber_getnint( BerElement *ber, long *num,
|
Line 172 ber_getnint( BerElement *ber, long *num,
|
/* sign extend if necessary */ |
/* sign extend if necessary */ |
p = (char *) &netnum; |
p = (char *) &netnum; |
sign = (0x80 & *(p+diff) ); |
sign = (0x80 & *(p+diff) ); |
if ( sign && len < sizeof(long) ) { |
if ( sign && ((unsigned) len < sizeof(long)) ) { |
for ( i = 0; i < diff; i++ ) { |
for ( i = 0; i < diff; i++ ) { |
*(p+i) = (unsigned char) 0xff; |
*(p+i) = (unsigned char) 0xff; |
} |
} |
Line 165 ber_get_int( BerElement *ber, long *num
|
Line 187 ber_get_int( BerElement *ber, long *num
|
{ |
{ |
unsigned long tag, len; |
unsigned long tag, len; |
|
|
|
assert( ber != NULL ); |
|
|
if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) |
if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) |
return( LBER_DEFAULT ); |
return( LBER_DEFAULT ); |
|
|
Line 182 ber_get_stringb( BerElement *ber, char *
|
Line 206 ber_get_stringb( BerElement *ber, char *
|
char *transbuf; |
char *transbuf; |
#endif /* STR_TRANSLATION */ |
#endif /* STR_TRANSLATION */ |
|
|
|
assert( ber != NULL ); |
|
|
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 - 1) ) |
Line 194 ber_get_stringb( BerElement *ber, char *
|
Line 220 ber_get_stringb( BerElement *ber, char *
|
|
|
#ifdef STR_TRANSLATION |
#ifdef STR_TRANSLATION |
if ( datalen > 0 && ( ber->ber_options & LBER_TRANSLATE_STRINGS ) != 0 |
if ( datalen > 0 && ( ber->ber_options & LBER_TRANSLATE_STRINGS ) != 0 |
&& ber->ber_decode_translate_proc != NULL ) { |
&& ber->ber_decode_translate_proc ) { |
transbuf = buf; |
transbuf = buf; |
++datalen; |
++datalen; |
if ( (*(ber->ber_decode_translate_proc))( &transbuf, &datalen, |
if ( (*(ber->ber_decode_translate_proc))( &transbuf, &datalen, |
Line 220 ber_get_stringa( BerElement *ber, char *
|
Line 246 ber_get_stringa( BerElement *ber, char *
|
{ |
{ |
unsigned long datalen, tag; |
unsigned long datalen, tag; |
|
|
|
assert( ber != NULL ); |
|
assert( buf != NULL ); |
|
|
if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) { |
if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) { |
*buf = NULL; |
*buf = NULL; |
return( LBER_DEFAULT ); |
return( LBER_DEFAULT ); |
Line 237 ber_get_stringa( BerElement *ber, char *
|
Line 266 ber_get_stringa( BerElement *ber, char *
|
|
|
#ifdef STR_TRANSLATION |
#ifdef STR_TRANSLATION |
if ( datalen > 0 && ( ber->ber_options & LBER_TRANSLATE_STRINGS ) != 0 |
if ( datalen > 0 && ( ber->ber_options & LBER_TRANSLATE_STRINGS ) != 0 |
&& ber->ber_decode_translate_proc != NULL ) { |
&& ber->ber_decode_translate_proc ) { |
++datalen; |
++datalen; |
if ( (*(ber->ber_decode_translate_proc))( buf, &datalen, 1 ) |
if ( (*(ber->ber_decode_translate_proc))( buf, &datalen, 1 ) |
!= 0 ) { |
!= 0 ) { |
Line 256 ber_get_stringal( BerElement *ber, struc
|
Line 285 ber_get_stringal( BerElement *ber, struc
|
{ |
{ |
unsigned long len, tag; |
unsigned long len, tag; |
|
|
|
assert( ber != NULL ); |
|
assert( bv != NULL ); |
|
|
if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) { |
if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) { |
*bv = NULL; |
*bv = NULL; |
return( LBER_DEFAULT ); |
return( LBER_DEFAULT ); |
Line 280 ber_get_stringal( BerElement *ber, struc
|
Line 312 ber_get_stringal( BerElement *ber, struc
|
|
|
#ifdef STR_TRANSLATION |
#ifdef STR_TRANSLATION |
if ( len > 0 && ( ber->ber_options & LBER_TRANSLATE_STRINGS ) != 0 |
if ( len > 0 && ( ber->ber_options & LBER_TRANSLATE_STRINGS ) != 0 |
&& ber->ber_decode_translate_proc != NULL ) { |
&& ber->ber_decode_translate_proc ) { |
++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 ) { |
Line 301 ber_get_bitstringa( BerElement *ber, cha
|
Line 333 ber_get_bitstringa( BerElement *ber, cha
|
unsigned long datalen, tag; |
unsigned long datalen, tag; |
unsigned char unusedbits; |
unsigned char unusedbits; |
|
|
|
assert( ber != NULL ); |
|
assert( buf != NULL ); |
|
assert( blen != NULL ); |
|
|
if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) { |
if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) { |
*buf = NULL; |
*buf = NULL; |
return( LBER_DEFAULT ); |
return( LBER_DEFAULT ); |
Line 331 ber_get_null( BerElement *ber )
|
Line 367 ber_get_null( BerElement *ber )
|
{ |
{ |
unsigned long len, tag; |
unsigned long len, tag; |
|
|
|
assert( ber != NULL ); |
|
|
if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) |
if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) |
return( LBER_DEFAULT ); |
return( LBER_DEFAULT ); |
|
|
Line 346 ber_get_boolean( BerElement *ber, int *b
|
Line 384 ber_get_boolean( BerElement *ber, int *b
|
long longbool; |
long longbool; |
int rc; |
int rc; |
|
|
|
assert( ber != NULL ); |
|
assert( boolval != NULL ); |
|
|
rc = ber_get_int( ber, &longbool ); |
rc = ber_get_int( ber, &longbool ); |
*boolval = longbool; |
*boolval = longbool; |
|
|
Line 355 ber_get_boolean( BerElement *ber, int *b
|
Line 396 ber_get_boolean( BerElement *ber, int *b
|
unsigned long |
unsigned long |
ber_first_element( BerElement *ber, unsigned long *len, char **last ) |
ber_first_element( BerElement *ber, unsigned long *len, char **last ) |
{ |
{ |
|
assert( ber != NULL ); |
|
assert( len != NULL ); |
|
assert( last != NULL ); |
|
|
/* 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; |
*last = NULL; |
Line 377 ber_first_element( BerElement *ber, unsi
|
Line 422 ber_first_element( BerElement *ber, unsi
|
unsigned long |
unsigned long |
ber_next_element( BerElement *ber, unsigned long *len, char *last ) |
ber_next_element( BerElement *ber, unsigned long *len, char *last ) |
{ |
{ |
|
assert( ber != NULL ); |
|
assert( len != NULL ); |
|
assert( last != NULL ); |
|
|
if ( ber->ber_ptr == last ) { |
if ( ber->ber_ptr == last ) { |
#ifdef LBER_END_SEQORSET |
#ifdef LBER_END_SEQORSET |
return( LBER_END_SEQORSET ); |
return( LBER_END_SEQORSET ); |
Line 392 ber_next_element( BerElement *ber, unsig
|
Line 441 ber_next_element( BerElement *ber, unsig
|
unsigned long |
unsigned long |
ber_scanf |
ber_scanf |
#if HAVE_STDARG |
#if HAVE_STDARG |
( BerElement *ber, char *fmt, ... ) |
( BerElement *ber, |
|
LDAP_CONST char *fmt, |
|
... ) |
#else |
#else |
( va_alist ) |
( va_alist ) |
va_dcl |
va_dcl |
Line 403 va_dcl
|
Line 454 va_dcl
|
BerElement *ber; |
BerElement *ber; |
char *fmt; |
char *fmt; |
#endif |
#endif |
char *fmt_reset; |
LDAP_CONST 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; |
Line 418 va_dcl
|
Line 469 va_dcl
|
ber = va_arg( ap, BerElement * ); |
ber = va_arg( ap, BerElement * ); |
fmt = va_arg( ap, char * ); |
fmt = va_arg( ap, char * ); |
#endif |
#endif |
|
|
|
assert( ber != NULL ); |
|
assert( fmt != NULL ); |
|
|
fmt_reset = fmt; |
fmt_reset = fmt; |
|
|
if ( ber->ber_debug ) { |
ber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug, |
lber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug, |
"ber_scanf fmt (%s) ber:\n", fmt ); |
"ber_scanf fmt (%s) ber:\n", fmt ); |
ber_log_dump( LDAP_DEBUG_BER, ber->ber_debug, ber, 1 ); |
lber_log_dump( LDAP_DEBUG_BER, ber->ber_debug, ber, 1 ); |
|
} |
|
|
|
for ( rc = 0; *fmt && rc != LBER_DEFAULT; fmt++ ) { |
for ( rc = 0; *fmt && rc != LBER_DEFAULT; fmt++ ) { |
/* When this is modified, remember to update |
/* When this is modified, remember to update |
* the error-cleanup code below accordingly. */ |
* the error-cleanup code below accordingly. */ |
switch ( *fmt ) { |
switch ( *fmt ) { |
|
case '!': { /* Hook */ |
|
BERDecodeCallback *f; |
|
void *p; |
|
|
|
f = va_arg( ap, BERDecodeCallback * ); |
|
p = va_arg( ap, void * ); |
|
|
|
rc = (*f)( ber, p, 0 ); |
|
} break; |
|
|
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 ** ); |
rc = ber_get_stringa( ber, ss ); |
rc = ber_get_stringa( ber, ss ); |
Line 448 va_dcl
|
Line 511 va_dcl
|
|
|
case 'l': /* length of next item */ |
case 'l': /* length of next item */ |
l = va_arg( ap, long * ); |
l = va_arg( ap, long * ); |
rc = ber_peek_tag( ber, (unsigned long *)l ); |
rc = ber_peek_tag( ber, l ); |
break; |
break; |
|
|
case 'n': /* null */ |
case 'n': /* null */ |
Line 458 va_dcl
|
Line 521 va_dcl
|
case 's': /* octet string - in a buffer */ |
case 's': /* octet string - in a buffer */ |
s = va_arg( ap, char * ); |
s = va_arg( ap, char * ); |
l = va_arg( ap, long * ); |
l = va_arg( ap, long * ); |
rc = ber_get_stringb( ber, s, (unsigned long *)l ); |
rc = ber_get_stringb( ber, s, l ); |
break; |
break; |
|
|
case 'o': /* octet string in a supplied berval */ |
case 'o': /* octet string in a supplied berval */ |
Line 475 va_dcl
|
Line 538 va_dcl
|
case 'B': /* bit string - allocate storage as needed */ |
case 'B': /* bit string - allocate storage as needed */ |
ss = va_arg( ap, char ** ); |
ss = va_arg( ap, char ** ); |
l = va_arg( ap, long * ); /* for length, in bits */ |
l = va_arg( ap, long * ); /* for length, in bits */ |
rc = ber_get_bitstringa( ber, ss, (unsigned long *)l ); |
rc = ber_get_bitstringa( ber, ss, l ); |
break; |
break; |
|
|
case 't': /* tag of next item */ |
case 't': /* tag of next item */ |
i = va_arg( ap, int * ); |
l = va_arg( ap, long * ); |
*i = rc = ber_peek_tag( ber, &len ); |
*l = rc = ber_peek_tag( ber, &len ); |
break; |
break; |
|
|
case 'T': /* skip tag of next item */ |
case 'T': /* skip tag of next item */ |
i = va_arg( ap, int * ); |
l = va_arg( ap, long * ); |
*i = rc = ber_skip_tag( ber, &len ); |
*l = rc = ber_skip_tag( ber, &len ); |
break; |
break; |
|
|
case 'v': /* sequence of strings */ |
case 'v': /* sequence of strings */ |
Line 494 va_dcl
|
Line 557 va_dcl
|
j = 0; |
j = 0; |
for ( tag = ber_first_element( ber, &len, &last ); |
for ( tag = ber_first_element( ber, &len, &last ); |
tag != LBER_DEFAULT && |
tag != LBER_DEFAULT && |
#ifdef LDAP_END_SEQORSET |
#ifdef LBER_END_SEQORSET |
tag != LBER_END_SEQORSET && |
tag != LBER_END_SEQORSET && |
#endif |
#endif |
rc != LBER_DEFAULT; |
rc != LBER_DEFAULT; |
Line 510 va_dcl
|
Line 573 va_dcl
|
rc = ber_get_stringa( ber, &((*sss)[j]) ); |
rc = ber_get_stringa( ber, &((*sss)[j]) ); |
j++; |
j++; |
} |
} |
#ifdef LDAP_END_SEQORSET |
#ifdef LBER_END_SEQORSET |
if (rc != LBER_DEFAULT && |
if (rc != LBER_DEFAULT && |
tag != LBER_END_SEQORSET ) |
tag != LBER_END_SEQORSET ) |
{ |
{ |
Line 527 va_dcl
|
Line 590 va_dcl
|
j = 0; |
j = 0; |
for ( tag = ber_first_element( ber, &len, &last ); |
for ( tag = ber_first_element( ber, &len, &last ); |
tag != LBER_DEFAULT && |
tag != LBER_DEFAULT && |
#ifdef LDAP_END_SEQORSET |
#ifdef LBER_END_SEQORSET |
tag != LBER_END_SEQORSET && |
tag != LBER_END_SEQORSET && |
#endif |
#endif |
rc != LBER_DEFAULT; |
rc != LBER_DEFAULT; |
Line 543 va_dcl
|
Line 606 va_dcl
|
rc = ber_get_stringal( ber, &((*bv)[j]) ); |
rc = ber_get_stringal( ber, &((*bv)[j]) ); |
j++; |
j++; |
} |
} |
#ifdef LDAP_END_SEQORSET |
#ifdef LBER_END_SEQORSET |
if (rc != LBER_DEFAULT && |
if (rc != LBER_DEFAULT && |
tag != LBER_END_SEQORSET ) |
tag != LBER_END_SEQORSET ) |
{ |
{ |
Line 572 va_dcl
|
Line 635 va_dcl
|
|
|
default: |
default: |
if( ber->ber_debug ) { |
if( ber->ber_debug ) { |
lber_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 ); |
} |
} |
rc = LBER_DEFAULT; |
rc = LBER_DEFAULT; |
Line 597 va_dcl
|
Line 660 va_dcl
|
|
|
for ( ; fmt_reset < fmt; fmt_reset++ ) { |
for ( ; fmt_reset < fmt; fmt_reset++ ) { |
switch ( *fmt_reset ) { |
switch ( *fmt_reset ) { |
|
case '!': { /* Hook */ |
|
BERDecodeCallback *f; |
|
void *p; |
|
|
|
f = va_arg( ap, BERDecodeCallback * ); |
|
p = va_arg( ap, void * ); |
|
|
|
(void) (*f)( ber, p, 1 ); |
|
} break; |
|
|
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 ** ); |
if ( *ss ) { |
if ( *ss ) { |
Line 606 va_dcl
|
Line 679 va_dcl
|
break; |
break; |
|
|
case 'b': /* boolean */ |
case 'b': /* boolean */ |
case 't': /* tag of next item */ |
|
case 'T': /* skip tag of next item */ |
|
(void) va_arg( ap, int * ); |
(void) va_arg( ap, int * ); |
break; |
break; |
|
|
case 's': /* octet string - in a buffer */ |
case 's': /* octet string - in a buffer */ |
(void) va_arg( ap, char * ); |
(void) va_arg( ap, char * ); |
/* Fall through */ |
(void) va_arg( ap, long * ); |
|
break; |
|
|
case 'e': /* enumerated */ |
case 'e': /* enumerated */ |
case 'i': /* int */ |
case 'i': /* int */ |
case 'l': /* length of next item */ |
case 'l': /* length of next item */ |
|
case 't': /* tag of next item */ |
|
case 'T': /* skip tag of next item */ |
(void) va_arg( ap, long * ); |
(void) va_arg( ap, long * ); |
break; |
break; |
|
|
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 * ); |
if ( bval->bv_val ) { |
if ( bval->bv_val != NULL ) { |
free( bval->bv_val ); |
free( bval->bv_val ); |
bval->bv_val = NULL; |
bval->bv_val = NULL; |
} |
} |
Line 649 va_dcl
|
Line 724 va_dcl
|
case 'v': /* sequence of strings */ |
case 'v': /* sequence of strings */ |
sss = va_arg( ap, char *** ); |
sss = va_arg( ap, char *** ); |
if ( *sss ) { |
if ( *sss ) { |
for (j = 0; (*sss)[j]; j++) |
for (j = 0; (*sss)[j]; j++) { |
free( (*sss)[j] ); |
free( (*sss)[j] ); |
|
(*sss)[j] = NULL; |
|
} |
free( *sss ); |
free( *sss ); |
*sss = NULL; |
*sss = NULL; |
} |
} |
Line 664 va_dcl
|
Line 741 va_dcl
|
} |
} |
break; |
break; |
|
|
#if 0 /* No action for these format characters */ |
|
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 */ |
case '[': /* begin set */ |
case '[': /* begin set */ |
case '}': /* end sequence */ |
case '}': /* end sequence */ |
case ']': /* end set */ |
case ']': /* end set */ |
#endif |
break; |
|
|
|
default: |
|
/* format should be good */ |
|
assert( 0 ); |
} |
} |
} |
} |
|
|
Line 685 va_dcl
|
Line 764 va_dcl
|
void |
void |
ber_bvfree( struct berval *bv ) |
ber_bvfree( struct berval *bv ) |
{ |
{ |
#ifdef LBER_ASSERT |
|
assert(bv != NULL); /* bv damn better point to something */ |
assert(bv != NULL); /* bv damn better point to something */ |
#endif |
|
if ( bv->bv_val != NULL ) |
if ( bv->bv_val != NULL ) |
free( bv->bv_val ); |
free( bv->bv_val ); |
free( (char *) bv ); |
free( (char *) bv ); |
Line 698 ber_bvecfree( struct berval **bv )
|
Line 776 ber_bvecfree( struct berval **bv )
|
{ |
{ |
int i; |
int i; |
|
|
#ifdef LBER_ASSERT |
|
assert(bv != NULL); /* bv damn better point to something */ |
assert(bv != NULL); /* bv damn better point to something */ |
#endif |
|
for ( i = 0; bv[i] != NULL; i++ ) |
for ( i = 0; bv[i] != NULL; i++ ) |
ber_bvfree( bv[i] ); |
ber_bvfree( bv[i] ); |
free( (char *) bv ); |
free( (char *) bv ); |
} |
} |
|
|
struct berval * |
struct berval * |
ber_bvdup( struct berval *bv ) |
ber_bvdup( |
|
LDAP_CONST struct berval *bv ) |
{ |
{ |
struct berval *new; |
struct berval *new; |
|
|
|
assert( bv != NULL ); |
|
|
|
if( bv == NULL ) { |
|
return NULL; |
|
} |
|
|
if ( (new = (struct berval *) malloc( sizeof(struct berval) )) |
if ( (new = (struct berval *) malloc( sizeof(struct berval) )) |
== NULL ) { |
== NULL ) { |
return( NULL ); |
return( NULL ); |
Line 740 void
|
Line 824 void
|
ber_set_string_translators( BerElement *ber, BERTranslateProc encode_proc, |
ber_set_string_translators( BerElement *ber, BERTranslateProc encode_proc, |
BERTranslateProc decode_proc ) |
BERTranslateProc decode_proc ) |
{ |
{ |
|
assert( ber != NULL ); |
|
|
ber->ber_encode_translate_proc = encode_proc; |
ber->ber_encode_translate_proc = encode_proc; |
ber->ber_decode_translate_proc = decode_proc; |
ber->ber_decode_translate_proc = decode_proc; |
} |
} |