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 48effc5b7e2917aa4bcba84f6f7f5c4c3a78e9f3..4a15d47a38b111f326ce57f37defedb8b97a4934 100644 (file)
--- a/libraries/liblber/decode.c
+++ b/libraries/liblber/decode.c
@@ -14,13 +14,9 @@
 #include "portable.h"
 
 #include <stdio.h>
-
-#ifdef STDC_HEADERS
 #include <stdlib.h>
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
+
+#include <ac/stdarg.h>
 
 #include <ac/string.h>
 #include <ac/socket.h>
@@ -40,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 );
@@ -348,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 ) );
@@ -358,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 ) );
@@ -367,7 +371,7 @@ ber_next_element( BerElement *ber, unsigned long *len, char *last )
 /* VARARGS */
 unsigned long
 ber_scanf
-#ifdef STDC_HEADERS
+#if HAVE_STDARG
        ( BerElement *ber, char *fmt, ... )
 #else
        ( va_alist )
@@ -375,7 +379,7 @@ va_dcl
 #endif
 {
        va_list         ap;
-#ifndef STDC_HEADERS
+#ifndef HAVE_STDARG
        BerElement      *ber;
        char            *fmt;
 #endif
@@ -383,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 STDC_HEADERS
+#ifdef HAVE_STDARG
        va_start( ap, fmt );
 #else
        va_start( ap );
@@ -466,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 *) );
@@ -478,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;
@@ -487,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 *) );
@@ -499,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;
@@ -536,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 );
@@ -546,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 );
@@ -560,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;