X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Fliblber%2Fdecode.c;h=aa33b44dad33a9b27520c950d260963d579ba36a;hb=e8116a8a74fa6e056863c3c962b4fedcf5d93a00;hp=b0ca907ff0b119ecbf443b23cee4423c4beaacd8;hpb=a80ff50a67ddeabddfefc62f90df7703eccf1841;p=openldap

diff --git a/libraries/liblber/decode.c b/libraries/liblber/decode.c
index b0ca907ff0..aa33b44dad 100644
--- a/libraries/liblber/decode.c
+++ b/libraries/liblber/decode.c
@@ -38,6 +38,8 @@ ber_get_tag( BerElement *ber )
 	char		*tagp;
 	unsigned int	i;
 
+	assert( ber != NULL );
+
 	if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 )
 		return( LBER_DEFAULT );
 
@@ -69,9 +71,13 @@ ber_skip_tag( BerElement *ber, unsigned long *len )
 {
 	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
@@ -99,12 +105,12 @@ ber_skip_tag( BerElement *ber, unsigned long *len )
 	*len = netlen = 0;
 	if ( ber_read( ber, (char *) &lc, 1 ) != 1 )
 		return( LBER_DEFAULT );
-	if ( lc & 0x80 ) {
-		noctets = (lc & 0x7f);
+	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 );
@@ -116,15 +122,24 @@ ber_skip_tag( BerElement *ber, unsigned long *len )
 }
 
 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 );
 }
 
@@ -135,6 +150,9 @@ ber_getnint( BerElement *ber, long *num, int len )
 	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,
@@ -169,6 +187,8 @@ ber_get_int( BerElement *ber, long *num )
 {
 	unsigned long	tag, len;
 
+	assert( ber != NULL );
+
 	if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT )
 		return( LBER_DEFAULT );
 
@@ -186,6 +206,8 @@ ber_get_stringb( BerElement *ber, char *buf, unsigned long *len )
 	char		*transbuf;
 #endif /* STR_TRANSLATION */
 
+	assert( ber != NULL );
+
 	if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT )
 		return( LBER_DEFAULT );
 	if ( datalen > (*len - 1) )
@@ -224,6 +246,9 @@ ber_get_stringa( BerElement *ber, char **buf )
 {
 	unsigned long	datalen, tag;
 
+	assert( ber != NULL );
+	assert( buf != NULL );
+
 	if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) {
 		*buf = NULL;
 		return( LBER_DEFAULT );
@@ -260,6 +285,9 @@ ber_get_stringal( BerElement *ber, struct berval **bv )
 {
 	unsigned long	len, tag;
 
+	assert( ber != NULL );
+	assert( bv != NULL );
+
 	if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) {
 		*bv = NULL;
 		return( LBER_DEFAULT );
@@ -305,6 +333,10 @@ ber_get_bitstringa( BerElement *ber, char **buf, unsigned long *blen )
 	unsigned long	datalen, tag;
 	unsigned char	unusedbits;
 
+	assert( ber != NULL );
+	assert( buf != NULL );
+	assert( blen != NULL );
+
 	if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) {
 		*buf = NULL;
 		return( LBER_DEFAULT );
@@ -335,6 +367,8 @@ ber_get_null( BerElement *ber )
 {
 	unsigned long	len, tag;
 
+	assert( ber != NULL );
+
 	if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT )
 		return( LBER_DEFAULT );
 
@@ -350,6 +384,9 @@ ber_get_boolean( BerElement *ber, int *boolval )
 	long	longbool;
 	int	rc;
 
+	assert( ber != NULL );
+	assert( boolval != NULL );
+
 	rc = ber_get_int( ber, &longbool );
 	*boolval = longbool;
 
@@ -359,6 +396,10 @@ ber_get_boolean( BerElement *ber, int *boolval )
 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;
@@ -381,6 +422,10 @@ ber_first_element( BerElement *ber, unsigned long *len, char **last )
 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 );
@@ -396,7 +441,9 @@ ber_next_element( BerElement *ber, unsigned long *len, char *last )
 unsigned long
 ber_scanf
 #if HAVE_STDARG
-	( BerElement *ber, char *fmt, ... )
+	( BerElement *ber,
+	LDAP_CONST char *fmt,
+	... )
 #else
 	( va_alist )
 va_dcl
@@ -407,7 +454,7 @@ va_dcl
 	BerElement	*ber;
 	char		*fmt;
 #endif
-	char		*fmt_reset;
+	LDAP_CONST char		*fmt_reset;
 	char		*last;
 	char		*s, **ss, ***sss;
 	struct berval 	***bv, **bvp, *bval;
@@ -422,18 +469,30 @@ va_dcl
 	ber = va_arg( ap, BerElement * );
 	fmt = va_arg( ap, char * );
 #endif
+
+	assert( ber != NULL );
+	assert( fmt != NULL );
+
 	fmt_reset = fmt;
 
-	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 );
-	}
+	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 );
@@ -452,7 +511,7 @@ va_dcl
 
 		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 */
@@ -462,7 +521,7 @@ va_dcl
 		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 */
@@ -479,17 +538,17 @@ va_dcl
 		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 */
@@ -498,7 +557,7 @@ va_dcl
 			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;
@@ -514,7 +573,7 @@ va_dcl
 				rc = ber_get_stringa( ber, &((*sss)[j]) );
 				j++;
 			}
-#ifdef LDAP_END_SEQORSET
+#ifdef LBER_END_SEQORSET
 			if (rc != LBER_DEFAULT && 
 				tag != LBER_END_SEQORSET )
 			{
@@ -531,7 +590,7 @@ va_dcl
 			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;
@@ -547,7 +606,7 @@ va_dcl
 				rc = ber_get_stringal( ber, &((*bv)[j]) );
 				j++;
 			}
-#ifdef LDAP_END_SEQORSET
+#ifdef LBER_END_SEQORSET
 			if (rc != LBER_DEFAULT && 
 				tag != LBER_END_SEQORSET )
 			{
@@ -576,7 +635,7 @@ va_dcl
 
 		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;
@@ -601,6 +660,16 @@ va_dcl
 
 	    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 ) {
@@ -610,23 +679,25 @@ va_dcl
 			break;
 
 		case 'b':	/* boolean */
-		case 't':	/* tag of next item */
-		case 'T':	/* skip tag of next item */
 			(void) va_arg( ap, int * );
 			break;
 
 		case 's':	/* octet string - in a buffer */
 			(void) va_arg( ap, char * );
-			/* Fall through */
+			(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 ) {
+			if ( bval->bv_val != NULL ) {
 				free( bval->bv_val );
 				bval->bv_val = NULL;
 			}
@@ -653,8 +724,10 @@ va_dcl
 		case 'v':	/* sequence of strings */
 			sss = va_arg( ap, char *** );
 			if ( *sss ) {
-				for (j = 0;  (*sss)[j];  j++)
+				for (j = 0;  (*sss)[j];  j++) {
 					free( (*sss)[j] );
+					(*sss)[j] = NULL;
+				}
 				free( *sss );
 				*sss = NULL;
 			}
@@ -668,15 +741,17 @@ va_dcl
 			}
 			break;
 
-#if 0		/* No action for these format characters */
 		case 'n':	/* null */
 		case 'x':	/* skip the next element - whatever it is */
 		case '{':	/* begin sequence */
 		case '[':	/* begin set */
 		case '}':	/* end sequence */
 		case ']':	/* end set */
-#endif
+			break;
 
+		default:
+			/* format should be good */
+			assert( 0 );
 		}
 	    }
 
@@ -689,9 +764,8 @@ 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 );
@@ -702,19 +776,25 @@ 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 );
 }
 
 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 );
@@ -744,6 +824,8 @@ void
 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;
 }