Use memcmp not strncmp for non-string comparisons.

[openldap] / libraries / liblber / decode.c

diff --git a/libraries/liblber/decode.c b/libraries/liblber/decode.c
index 1d87539e8af19947ee0cf369845683da7d2f3f83..aa33b44dad33a9b27520c950d260963d579ba36a 100644 (file)
--- a/libraries/liblber/decode.c
+++ b/libraries/liblber/decode.c
@@ -71,7 +71,8 @@ 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 );
@@ -104,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 );
@@ -126,7 +127,11 @@ ber_peek_tag(
        unsigned long *len )
 {
        unsigned long   tag;
-       BerElement *ber = ber_dup( ber_in );
+       BerElement *ber;
+
+       assert( ber_in != NULL );
+
+       ber = ber_dup( ber_in );
 
        if( ber == NULL ) {
                return LBER_ERROR;
@@ -134,7 +139,7 @@ ber_peek_tag(
 
        tag = ber_skip_tag( ber, len );
 
-       ber_free( ber, 1 );
+       ber_free( ber, 0 );
        return( tag );
 }
 
@@ -182,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 );
 
@@ -199,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) )
@@ -237,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 );
@@ -273,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 );
@@ -318,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 );
@@ -348,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 );
 
@@ -363,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;
 
@@ -372,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;
@@ -394,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 );
@@ -430,8 +462,6 @@ va_dcl
        long            *l;
        unsigned long   rc, tag, len;
 
-       assert( ber != NULL );
-
 #ifdef HAVE_STDARG
        va_start( ap, fmt );
 #else
@@ -445,11 +475,9 @@ va_dcl
 
        fmt_reset = fmt;
 
-       if ( ber->ber_debug ) {
-               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 );
-       }
+       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
@@ -483,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 */
@@ -493,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 */
@@ -510,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 */
@@ -651,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;
                        }
@@ -694,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;
                        }
@@ -709,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 );
                }
            }