Validate outvalue after session param.

[openldap] / libraries / libldap / cldap.c

diff --git a/libraries/libldap/cldap.c b/libraries/libldap/cldap.c
index def3e8b6df34af1b4d1e0eb0bb6b328f41fdc6ac..58a6abc9041d6d08b13c672f254e979bc6df80f9 100644 (file)
--- a/libraries/libldap/cldap.c
+++ b/libraries/libldap/cldap.c
@@ -14,7 +14,8 @@
 #ifdef LDAP_CONNECTIONLESS
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/errno.h>
 #include <ac/socket.h>
@@ -69,7 +70,7 @@ cldap_open( char *host, int port )
     int                 local_h_errno;
     char               *ha_buf=NULL;
 
-#define DO_RETURN(x) if (ha_buf) free(ha_buf); return (x);
+#define DO_RETURN(x) if (ha_buf) LDAP_FREE(ha_buf); return (x);
    
     Debug( LDAP_DEBUG_TRACE, "ldap_open\n", 0, 0, 0 );
 
@@ -97,7 +98,7 @@ cldap_open( char *host, int port )
        return NULL;
     }
        
-    ld->ld_version = LDAP_VERSION;
+    ld->ld_version = LDAP_VERSION2;
 
     sock.sin_family = AF_INET;
     sock.sin_port = htons( port );
@@ -143,7 +144,7 @@ cldap_open( char *host, int port )
            }
 
            if ( ld->ld_host == NULL ) {
-                   ld->ld_host = strdup( host );
+                   ld->ld_host = LDAP_STRDUP( host );
            }
        }
     } else {
@@ -249,21 +250,17 @@ add_addr( LDAP *ld, struct sockaddr *sap )
 {
     struct sockaddr    *newsap, **addrs;
 
-    if (( newsap = (struct sockaddr *)malloc( sizeof( struct sockaddr )))
+    if (( newsap = (struct sockaddr *)LDAP_MALLOC( sizeof( struct sockaddr )))
            == NULL ) {
        ld->ld_errno = LDAP_NO_MEMORY;
        return( -1 );
     }
        
-    if ( ld->ld_cldapnaddr == 0 ) {    
-       addrs = (struct sockaddr **)malloc( sizeof(struct sockaddr *));
-    } else {
-       addrs = (struct sockaddr **)realloc( ld->ld_cldapaddrs,
+       addrs = (struct sockaddr **)LDAP_REALLOC( ld->ld_cldapaddrs,
                ( ld->ld_cldapnaddr + 1 ) * sizeof(struct sockaddr *));
-    }
 
     if ( addrs == NULL ) {
-       free( newsap );
+       LDAP_FREE( newsap );
        ld->ld_errno = LDAP_NO_MEMORY;
        return( -1 );
     }
@@ -282,7 +279,8 @@ cldap_result( LDAP *ld, int msgid, LDAPMessage **res,
     Sockbuf            *sb = &ld->ld_sb;
     BerElement         ber;
     char               *logdn;
-    int                        ret, id, fromaddr, i;
+    int                        ret, fromaddr, i;
+       ber_int_t       id;
     struct timeval     tv;
 
     fromaddr = -1;
@@ -339,13 +337,13 @@ cldap_result( LDAP *ld, int msgid, LDAPMessage **res,
        logdn = NULL;
 
        if ( ber_scanf( &ber, "ia", &id, &logdn ) == LBER_ERROR ) {
-           free( ber.ber_buf );        /* gack! */
+           LDAP_FREE( ber.ber_buf );   /* gack! */
            ret = LDAP_DECODING_ERROR;
            Debug( LDAP_DEBUG_TRACE,
                    "cldap_result: ber_scanf returned LBER_ERROR (%d)\n",
                    ret, 0, 0 );
        } else if ( id != msgid ) {
-           free( ber.ber_buf );        /* gack! */
+           LDAP_FREE( ber.ber_buf );   /* gack! */
            Debug( LDAP_DEBUG_TRACE,
                    "cldap_result: looking for msgid %d; got %d\n",
                    msgid, id, 0 );
@@ -367,13 +365,13 @@ cldap_result( LDAP *ld, int msgid, LDAPMessage **res,
                    }
            }
            ret = cldap_parsemsg( ld, msgid, &ber, res, base );
-           free( ber.ber_buf );        /* gack! */
+           LDAP_FREE( ber.ber_buf );   /* gack! */
            Debug( LDAP_DEBUG_TRACE,
                "cldap_result got result (%d)\n", ret, 0, 0 );
        }
 
        if ( logdn != NULL ) {
-               free( logdn );
+               LDAP_FREE( logdn );
        }
     }
     
@@ -409,8 +407,10 @@ static int
 cldap_parsemsg( LDAP *ld, int msgid, BerElement *ber,
        LDAPMessage **res, char *base )
 {
-    unsigned long      tag, len;
-    int                        baselen, slen, rc;
+    ber_tag_t  tag;
+       ber_len_t       len;
+    int                        baselen, slen;
+       ber_tag_t       rc;
     char               *dn, *p, *cookie;
     LDAPMessage                *chain, *prev, *ldm;
     struct berval      *bv;
@@ -423,9 +423,9 @@ cldap_parsemsg( LDAP *ld, int msgid, BerElement *ber,
     for ( tag = ber_first_element( ber, &len, &cookie );
            tag != LBER_DEFAULT && rc != LDAP_SUCCESS;
            tag = ber_next_element( ber, &len, cookie )) {
-       if (( ldm = (LDAPMessage *)calloc( 1, sizeof(LDAPMessage)))
+       if (( ldm = (LDAPMessage *)LDAP_CALLOC( 1, sizeof(LDAPMessage)))
                == NULL || ( ldm->lm_ber = ldap_alloc_ber_with_options( ld ))
-               == NULLBER ) {
+               == NULL ) {
            rc = LDAP_NO_MEMORY;
            break;      /* return w/error*/
        }
@@ -440,8 +440,7 @@ cldap_parsemsg( LDAP *ld, int msgid, BerElement *ber,
                break;  /* return w/error */
            }
 
-           if ( ber_printf( ldm->lm_ber, "to", tag, bv->bv_val,
-                   bv->bv_len ) == -1 ) {
+           if ( ber_printf( ldm->lm_ber, "tO", tag, bv ) == -1 ) {
                break;  /* return w/error */
            }
            ber_bvfree( bv );
@@ -449,7 +448,7 @@ cldap_parsemsg( LDAP *ld, int msgid, BerElement *ber,
            rc = LDAP_SUCCESS;
 
        } else if ( tag == LDAP_RES_SEARCH_ENTRY ) {
-           if ( ber_scanf( ber, "{aO", &dn, &bv ) == LBER_ERROR ) {
+           if ( ber_scanf( ber, "{aO" /*}*/, &dn, &bv ) == LBER_ERROR ) {
                break;  /* return w/error */
            }
            Debug( LDAP_DEBUG_TRACE, "cldap_parsemsg entry %s\n", dn, 0, 0 );
@@ -458,14 +457,14 @@ cldap_parsemsg( LDAP *ld, int msgid, BerElement *ber,
                /*
                 * substitute original searchbase for trailing '*'
                 */
-               if (( p = (char *)malloc( slen + baselen )) == NULL ) {
+               if (( p = (char *)LDAP_MALLOC( slen + baselen )) == NULL ) {
                    rc = LDAP_NO_MEMORY;
-                   free( dn );
+                   LDAP_FREE( dn );
                    break;      /* return w/error */
                }
                strcpy( p, dn );
                strcpy( p + slen - 1, base );
-               free( dn );
+               LDAP_FREE( dn );
                dn = p;
            }
 
@@ -473,7 +472,7 @@ cldap_parsemsg( LDAP *ld, int msgid, BerElement *ber,
                    bv->bv_len ) == -1 ) {
                break;  /* return w/error */
            }
-           free( dn );
+           LDAP_FREE( dn );
            ber_bvfree( bv );
            bv = NULL;
                
@@ -516,10 +515,10 @@ cldap_parsemsg( LDAP *ld, int msgid, BerElement *ber,
 
     /* dispose of any leftovers */
     if ( ldm != NULL ) {
-       if ( ldm->lm_ber != NULLBER ) {
+       if ( ldm->lm_ber != NULL ) {
            ber_free( ldm->lm_ber, 1 );
        }
-       free( ldm );
+       LDAP_FREE( ldm );
     }
     if ( bv != NULL ) {
        ber_bvfree( bv );