/* 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.
*
char *tagp;
unsigned int i;
+ assert( ber != NULL );
+
if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 )
return( LBER_DEFAULT );
{
unsigned long tag;
unsigned char lc;
- int noctets, diff;
+ unsigned int noctets;
+ int diff;
unsigned long netlen;
+ assert( ber != NULL );
+ assert( len != NULL );
+
/*
* Any ber element looks like this: tag length contents.
* Assuming everything's ok, we return the tag byte (we
*len = netlen = 0;
if ( ber_read( ber, (char *) &lc, 1 ) != 1 )
return( LBER_DEFAULT );
- if ( lc & 0x80 ) {
- noctets = (lc & 0x7f);
- if ( noctets > sizeof(unsigned long) )
+ if ( lc & 0x80U ) {
+ noctets = (lc & 0x7fU);
+ if ( (unsigned) noctets > sizeof(unsigned long) )
return( LBER_DEFAULT );
diff = sizeof(unsigned long) - noctets;
- if ( ber_read( ber, (char *) &netlen + diff, noctets )
+ if ( (unsigned) ber_read( ber, (char *) &netlen + diff, noctets )
!= noctets )
return( LBER_DEFAULT );
*len = AC_NTOHL( netlen );
}
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;
+ 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 );
- ber->ber_ptr = save;
+ ber_free( ber, 0 );
return( tag );
}
long netnum;
char *p;
+ assert( ber != NULL );
+ assert( num != NULL );
+
/*
* The tag and length have already been stripped off. We should
* be sitting right before len bytes of 2's complement integer,
* extend after we read it in.
*/
- if ( len > sizeof(long) )
+ if ( (unsigned) len > sizeof(long) )
return( -1 );
netnum = 0;
/* sign extend if necessary */
p = (char *) &netnum;
sign = (0x80 & *(p+diff) );
- if ( sign && len < sizeof(long) ) {
+ if ( sign && ((unsigned) len < sizeof(long)) ) {
for ( i = 0; i < diff; i++ ) {
*(p+i) = (unsigned char) 0xff;
}
{
unsigned long tag, len;
+ assert( ber != NULL );
+
if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT )
return( LBER_DEFAULT );
char *transbuf;
#endif /* STR_TRANSLATION */
+ assert( ber != NULL );
+
if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT )
return( LBER_DEFAULT );
if ( datalen > (*len - 1) )
#ifdef STR_TRANSLATION
if ( datalen > 0 && ( ber->ber_options & LBER_TRANSLATE_STRINGS ) != 0
- && ber->ber_decode_translate_proc != NULL ) {
+ && ber->ber_decode_translate_proc ) {
transbuf = buf;
++datalen;
if ( (*(ber->ber_decode_translate_proc))( &transbuf, &datalen,
{
unsigned long datalen, tag;
- if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT )
+ assert( ber != NULL );
+ assert( buf != NULL );
+
+ if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) {
+ *buf = NULL;
return( LBER_DEFAULT );
+ }
if ( (*buf = (char *) malloc( (size_t)datalen + 1 )) == NULL )
return( LBER_DEFAULT );
- if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen )
+ if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen ) {
+ free( *buf );
+ *buf = NULL;
return( LBER_DEFAULT );
+ }
(*buf)[datalen] = '\0';
#ifdef STR_TRANSLATION
if ( datalen > 0 && ( ber->ber_options & LBER_TRANSLATE_STRINGS ) != 0
- && ber->ber_decode_translate_proc != NULL ) {
+ && ber->ber_decode_translate_proc ) {
++datalen;
if ( (*(ber->ber_decode_translate_proc))( buf, &datalen, 1 )
!= 0 ) {
free( *buf );
+ *buf = NULL;
return( LBER_DEFAULT );
}
}
{
unsigned long len, tag;
- if ( (*bv = (struct berval *) malloc( sizeof(struct berval) )) == NULL )
+ assert( ber != NULL );
+ assert( bv != NULL );
+
+ if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) {
+ *bv = NULL;
return( LBER_DEFAULT );
+ }
- if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT )
+ if ( (*bv = (struct berval *) malloc( sizeof(struct berval) )) == NULL )
return( LBER_DEFAULT );
- if ( ((*bv)->bv_val = (char *) malloc( (size_t)len + 1 )) == NULL )
+ if ( ((*bv)->bv_val = (char *) malloc( (size_t)len + 1 )) == NULL ) {
+ free( *bv );
+ *bv = NULL;
return( LBER_DEFAULT );
+ }
- if ( (unsigned long) ber_read( ber, (*bv)->bv_val, len ) != len )
+ if ( (unsigned long) 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;
#ifdef STR_TRANSLATION
if ( len > 0 && ( ber->ber_options & LBER_TRANSLATE_STRINGS ) != 0
- && ber->ber_decode_translate_proc != NULL ) {
+ && ber->ber_decode_translate_proc ) {
++len;
if ( (*(ber->ber_decode_translate_proc))( &((*bv)->bv_val),
&len, 1 ) != 0 ) {
- free( (*bv)->bv_val );
+ ber_bvfree( *bv );
+ *bv = NULL;
return( LBER_DEFAULT );
}
(*bv)->bv_len = len - 1;
unsigned long datalen, tag;
unsigned char unusedbits;
- if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT )
+ assert( ber != NULL );
+ assert( buf != NULL );
+ assert( blen != NULL );
+
+ if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) {
+ *buf = NULL;
return( LBER_DEFAULT );
+ }
--datalen;
if ( (*buf = (char *) malloc( (size_t)datalen )) == NULL )
return( LBER_DEFAULT );
- if ( ber_read( ber, (char *)&unusedbits, 1 ) != 1 )
+ if ( ber_read( ber, (char *)&unusedbits, 1 ) != 1 ) {
+ free( buf );
+ *buf = NULL;
return( LBER_DEFAULT );
+ }
- if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen )
+ if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen ) {
+ free( buf );
+ *buf = NULL;
return( LBER_DEFAULT );
+ }
*blen = datalen * 8 - unusedbits;
return( tag );
{
unsigned long len, tag;
+ assert( ber != NULL );
+
if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT )
return( LBER_DEFAULT );
long longbool;
int rc;
+ assert( ber != NULL );
+ assert( boolval != NULL );
+
rc = ber_get_int( ber, &longbool );
*boolval = longbool;
unsigned long
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 */
if ( ber_skip_tag( ber, len ) == LBER_DEFAULT ) {
+ *last = NULL;
return( LBER_DEFAULT );
}
unsigned long
ber_next_element( BerElement *ber, unsigned long *len, char *last )
{
+ assert( ber != NULL );
+ assert( len != NULL );
+ assert( last != NULL );
+
if ( ber->ber_ptr == last ) {
#ifdef LBER_END_SEQORSET
return( LBER_END_SEQORSET );
unsigned long
ber_scanf
#if HAVE_STDARG
- ( BerElement *ber, char *fmt, ... )
+ ( BerElement *ber,
+ LDAP_CONST char *fmt,
+ ... )
#else
( va_alist )
va_dcl
BerElement *ber;
char *fmt;
#endif
+ LDAP_CONST char *fmt_reset;
char *last;
char *s, **ss, ***sss;
struct berval ***bv, **bvp, *bval;
fmt = va_arg( ap, char * );
#endif
- 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 );
- }
+ assert( ber != NULL );
+ assert( fmt != NULL );
+
+ fmt_reset = fmt;
+
+ ber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug,
+ "ber_scanf fmt (%s) ber:\n", fmt );
+ ber_log_dump( LDAP_DEBUG_BER, ber->ber_debug, ber, 1 );
for ( rc = 0; *fmt && rc != LBER_DEFAULT; fmt++ ) {
+ /* When this is modified, remember to update
+ * the error-cleanup code below accordingly. */
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 */
ss = va_arg( ap, char ** );
rc = ber_get_stringa( ber, ss );
case 'l': /* length of next item */
l = va_arg( ap, long * );
- rc = ber_peek_tag( ber, (unsigned long *)l );
+ rc = ber_peek_tag( ber, l );
break;
case 'n': /* null */
case 's': /* octet string - in a buffer */
s = va_arg( ap, char * );
l = va_arg( ap, long * );
- rc = ber_get_stringb( ber, s, (unsigned long *)l );
+ rc = ber_get_stringb( ber, s, l );
break;
case 'o': /* octet string in a supplied berval */
case 'B': /* bit string - allocate storage as needed */
ss = va_arg( ap, char ** );
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;
case 't': /* tag of next item */
- i = va_arg( ap, int * );
- *i = rc = ber_peek_tag( ber, &len );
+ l = va_arg( ap, long * );
+ *l = rc = ber_peek_tag( ber, &len );
break;
case 'T': /* skip tag of next item */
- i = va_arg( ap, int * );
- *i = rc = ber_skip_tag( ber, &len );
+ l = va_arg( ap, long * );
+ *l = rc = ber_skip_tag( ber, &len );
break;
case 'v': /* sequence of strings */
j = 0;
for ( tag = ber_first_element( ber, &len, &last );
tag != LBER_DEFAULT &&
-#ifdef LDAP_END_SEQORSET
+#ifdef LBER_END_SEQORSET
tag != LBER_END_SEQORSET &&
#endif
rc != LBER_DEFAULT;
rc = ber_get_stringa( ber, &((*sss)[j]) );
j++;
}
-#ifdef LDAP_END_SEQORSET
+#ifdef LBER_END_SEQORSET
if (rc != LBER_DEFAULT &&
tag != LBER_END_SEQORSET )
{
j = 0;
for ( tag = ber_first_element( ber, &len, &last );
tag != LBER_DEFAULT &&
-#ifdef LDAP_END_SEQORSET
+#ifdef LBER_END_SEQORSET
tag != LBER_END_SEQORSET &&
#endif
rc != LBER_DEFAULT;
rc = ber_get_stringal( ber, &((*bv)[j]) );
j++;
}
-#ifdef LDAP_END_SEQORSET
+#ifdef LBER_END_SEQORSET
if (rc != LBER_DEFAULT &&
tag != LBER_END_SEQORSET )
{
default:
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 );
}
rc = LBER_DEFAULT;
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 '!': { /* 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 */
+ ss = va_arg( ap, char ** );
+ if ( *ss ) {
+ free( *ss );
+ *ss = NULL;
+ }
+ break;
+
+ case 'b': /* boolean */
+ (void) va_arg( ap, int * );
+ break;
+
+ case 's': /* octet string - in a buffer */
+ (void) va_arg( ap, char * );
+ (void) va_arg( ap, long * );
+ break;
+
+ case 'e': /* enumerated */
+ case 'i': /* int */
+ case 'l': /* length of next item */
+ case 't': /* tag of next item */
+ case 'T': /* skip tag 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 != NULL ) {
+ 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] );
+ (*sss)[j] = NULL;
+ }
+ 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;
+
+ case 'n': /* null */
+ case 'x': /* skip the next element - whatever it is */
+ case '{': /* begin sequence */
+ case '[': /* begin set */
+ case '}': /* end sequence */
+ case ']': /* end set */
+ break;
+
+ default:
+ /* format should be good */
+ assert( 0 );
+ }
+ }
+
+ va_end( ap );
+ }
+
return( rc );
}
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 );
{
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 );
}
struct berval *
-ber_bvdup( struct berval *bv )
+ber_bvdup(
+ LDAP_CONST struct berval *bv )
{
struct berval *new;
+ assert( bv != NULL );
+
+ if( bv == NULL ) {
+ return NULL;
+ }
+
if ( (new = (struct berval *) malloc( sizeof(struct berval) ))
== NULL ) {
return( NULL );
ber_set_string_translators( BerElement *ber, BERTranslateProc encode_proc,
BERTranslateProc decode_proc )
{
+ assert( ber != NULL );
+
ber->ber_encode_translate_proc = encode_proc;
ber->ber_decode_translate_proc = decode_proc;
}
projects / openldap / blobdiff