Add draft-ietf-ldapext-ldap-c-api-01 routines ber_init()

[openldap] / libraries / liblber / decode.c

diff --git a/libraries/liblber/decode.c b/libraries/liblber/decode.c
index d16ca53756ecc2160181f67ab282145040c4f3e7..4a15d47a38b111f326ce57f37defedb8b97a4934 100644 (file)
--- a/libraries/liblber/decode.c
+++ b/libraries/liblber/decode.c
@@ -11,42 +11,17 @@
  * is provided ``as is'' without express or implied warranty.
  */
 
-#define LDAP_BRIDGE /* disable LDAP_BRIDGE code */
 #include "portable.h"
 
 #include <stdio.h>
-
-#ifdef MACOS
 #include <stdlib.h>
-#include <stdarg.h>
-#include "macos.h"
-#else /* MACOS */
 
-#if defined(NeXT) || defined(VMS) || defined(__FreeBSD__)
-#include <stdlib.h>
-#else /* next || vms || freebsd */
-#include <malloc.h>
-#endif /* next || vms || freebsd */
-#if defined(BC31) || defined(_WIN32)
-#include <stdarg.h>
-#else /* BC31 || _WIN32 */
-#include <varargs.h>
-#endif /* BC31 || _WIN32 */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#ifdef PCNFS
-#include <tklib.h>
-#endif /* PCNFS */
-#endif /* MACOS */
-
-#if defined( DOS ) || defined( _WIN32 )
-#include "msdos.h"
-#endif /* DOS */
-
-#include <string.h>
-
-#include "lber.h"
+#include <ac/stdarg.h>
+
+#include <ac/string.h>
+#include <ac/socket.h>
+
+#include "lber-int.h"
 
 #ifdef LDAP_DEBUG
 int    lber_debug;
@@ -61,7 +36,7 @@ ber_get_tag( BerElement *ber )
        unsigned char   xbyte;
        unsigned long   tag;
        char            *tagp;
-       int             i;
+       unsigned int    i;
 
        if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 )
                return( LBER_DEFAULT );
@@ -132,7 +107,7 @@ ber_skip_tag( BerElement *ber, unsigned long *len )
                if ( ber_read( ber, (char *) &netlen + diff, noctets )
                    != noctets )
                        return( LBER_DEFAULT );
-               *len = LBER_NTOHL( netlen );
+               *len = AC_NTOHL( netlen );
        } else {
                *len = lc;
        }
@@ -181,10 +156,10 @@ ber_getnint( BerElement *ber, long *num, int len )
         sign = (0x80 & *(p+diff) );
         if ( sign && len < sizeof(long) ) {
                 for ( i = 0; i < diff; i++ ) {
-                        *(p+i) = 0xff;
+                        *(p+i) = (unsigned char) 0xff;
                }
        }
-       *num = LBER_NTOHL( netnum );
+       *num = AC_NTOHL( netnum );
 
        return( len );
 }
@@ -197,7 +172,7 @@ ber_get_int( BerElement *ber, long *num )
        if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT )
                return( LBER_DEFAULT );
 
-       if ( ber_getnint( ber, num, (int)len ) != len )
+       if ( (unsigned long) ber_getnint( ber, num, (int)len ) != len )
                return( LBER_DEFAULT );
        else
                return( tag );
@@ -216,7 +191,7 @@ ber_get_stringb( BerElement *ber, char *buf, unsigned long *len )
        if ( datalen > (*len - 1) )
                return( LBER_DEFAULT );
 
-       if ( ber_read( ber, buf, datalen ) != datalen )
+       if ( (unsigned long) ber_read( ber, buf, datalen ) != datalen )
                return( LBER_DEFAULT );
 
        buf[datalen] = '\0';
@@ -255,7 +230,7 @@ ber_get_stringa( BerElement *ber, char **buf )
        if ( (*buf = (char *) malloc( (size_t)datalen + 1 )) == NULL )
                return( LBER_DEFAULT );
 
-       if ( ber_read( ber, *buf, datalen ) != datalen )
+       if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen )
                return( LBER_DEFAULT );
        (*buf)[datalen] = '\0';
 
@@ -288,7 +263,7 @@ ber_get_stringal( BerElement *ber, struct berval **bv )
        if ( ((*bv)->bv_val = (char *) malloc( (size_t)len + 1 )) == NULL )
                return( LBER_DEFAULT );
 
-       if ( ber_read( ber, (*bv)->bv_val, len ) != len )
+       if ( (unsigned long) ber_read( ber, (*bv)->bv_val, len ) != len )
                return( LBER_DEFAULT );
        ((*bv)->bv_val)[len] = '\0';
        (*bv)->bv_len = len;
@@ -325,7 +300,7 @@ ber_get_bitstringa( BerElement *ber, char **buf, unsigned long *blen )
        if ( ber_read( ber, (char *)&unusedbits, 1 ) != 1 )
                return( LBER_DEFAULT );
 
-       if ( ber_read( ber, *buf, datalen ) != datalen )
+       if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen )
                return( LBER_DEFAULT );
 
        *blen = datalen * 8 - unusedbits;
@@ -369,7 +344,11 @@ ber_first_element( BerElement *ber, unsigned long *len, char **last )
        *last = ber->ber_ptr + *len;
 
        if ( *last == ber->ber_ptr ) {
+#ifdef LBER_END_SEQORSET 
+               return( LBER_END_SEQORSET );
+#else
                return( LBER_DEFAULT );
+#endif
        }
 
        return( ber_peek_tag( ber, len ) );
@@ -379,7 +358,11 @@ unsigned long
 ber_next_element( BerElement *ber, unsigned long *len, char *last )
 {
        if ( ber->ber_ptr == last ) {
+#ifdef LBER_END_SEQORSET 
+               return( LBER_END_SEQORSET );
+#else
                return( LBER_DEFAULT );
+#endif
        }
 
        return( ber_peek_tag( ber, len ) );
@@ -387,16 +370,16 @@ ber_next_element( BerElement *ber, unsigned long *len, char *last )
 
 /* VARARGS */
 unsigned long
-ber_scanf(
-#if defined( MACOS ) || defined( BC31 ) || defined( _WIN32 )
-       BerElement *ber, char *fmt, ... )
+ber_scanf
+#if HAVE_STDARG
+       ( BerElement *ber, char *fmt, ... )
 #else
-       va_alist )
+       ( va_alist )
 va_dcl
 #endif
 {
        va_list         ap;
-#if !defined( MACOS ) && !defined( BC31 ) && !defined( _WIN32 )
+#ifndef HAVE_STDARG
        BerElement      *ber;
        char            *fmt;
 #endif
@@ -404,10 +387,10 @@ va_dcl
        char            *s, **ss, ***sss;
        struct berval   ***bv, **bvp, *bval;
        int             *i, j;
-       long            *l, rc, tag;
-       unsigned long   len;
+       long            *l;
+       unsigned long   rc, tag, len;
 
-#if defined( MACOS ) || defined( BC31 ) || defined( _WIN32 )
+#ifdef HAVE_STDARG
        va_start( ap, fmt );
 #else
        va_start( ap );
@@ -487,8 +470,13 @@ va_dcl
                        *sss = NULL;
                        j = 0;
                        for ( tag = ber_first_element( ber, &len, &last );
-                           tag != LBER_DEFAULT && rc != LBER_DEFAULT;
-                           tag = ber_next_element( ber, &len, last ) ) {
+                           tag != LBER_DEFAULT && 
+#ifdef LDAP_END_SEQORSET
+                                       tag != LBER_END_SEQORSET &&
+#endif
+                                       rc != LBER_DEFAULT;
+                           tag = ber_next_element( ber, &len, last ) )
+                       {
                                if ( *sss == NULL ) {
                                        *sss = (char **) malloc(
                                            2 * sizeof(char *) );
@@ -499,6 +487,13 @@ va_dcl
                                rc = ber_get_stringa( ber, &((*sss)[j]) );
                                j++;
                        }
+#ifdef LDAP_END_SEQORSET
+                       if (rc != LBER_DEFAULT && 
+                               tag != LBER_END_SEQORSET )
+                       {
+                               rc = LBER_DEFAULT;
+                       }
+#endif
                        if ( j > 0 )
                                (*sss)[j] = NULL;
                        break;
@@ -508,8 +503,13 @@ va_dcl
                        *bv = NULL;
                        j = 0;
                        for ( tag = ber_first_element( ber, &len, &last );
-                           tag != LBER_DEFAULT && rc != LBER_DEFAULT;
-                           tag = ber_next_element( ber, &len, last ) ) {
+                           tag != LBER_DEFAULT && 
+#ifdef LDAP_END_SEQORSET
+                                       tag != LBER_END_SEQORSET &&
+#endif
+                                       rc != LBER_DEFAULT;
+                           tag = ber_next_element( ber, &len, last ) )
+                       {
                                if ( *bv == NULL ) {
                                        *bv = (struct berval **) malloc(
                                            2 * sizeof(struct berval *) );
@@ -520,6 +520,13 @@ va_dcl
                                rc = ber_get_stringal( ber, &((*bv)[j]) );
                                j++;
                        }
+#ifdef LDAP_END_SEQORSET
+                       if (rc != LBER_DEFAULT && 
+                               tag != LBER_END_SEQORSET )
+                       {
+                               rc = LBER_DEFAULT;
+                       }
+#endif
                        if ( j > 0 )
                                (*bv)[j] = NULL;
                        break;
@@ -541,9 +548,9 @@ va_dcl
                        break;
 
                default:
-#ifndef NO_USERINTERFACE
+#ifdef LDAP_LIBUI
                        fprintf( stderr, "unknown fmt %c\n", *fmt );
-#endif /* NO_USERINTERFACE */
+#endif /* LDAP_LIBUI */
                        rc = LBER_DEFAULT;
                        break;
                }
@@ -557,6 +564,9 @@ 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 );
@@ -567,6 +577,9 @@ 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 );
@@ -581,9 +594,18 @@ ber_bvdup( struct berval *bv )
            == NULL ) {
                return( NULL );
        }
+
+       if ( bv->bv_val == NULL ) {
+               new->bv_val = NULL;
+               new->bv_len = 0;
+               return ( new );
+       }
+
        if ( (new->bv_val = (char *) malloc( bv->bv_len + 1 )) == NULL ) {
+               free( new );
                return( NULL );
        }
+
        SAFEMEMCPY( new->bv_val, bv->bv_val, (size_t) bv->bv_len );
        new->bv_val[bv->bv_len] = '\0';
        new->bv_len = bv->bv_len;