Validate outvalue after session param.

[openldap] / libraries / libldap / getentry.c

diff --git a/libraries/libldap/getentry.c b/libraries/libldap/getentry.c
index 5dc62fdf42ac72b4a83899ba433ce890f1db2e7d..6e5d15eb681e4ea3a3b2425b6634f21c08e0bb05 100644 (file)
--- a/libraries/libldap/getentry.c
+++ b/libraries/libldap/getentry.c
@@ -12,7 +12,7 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/socket.h>
@@ -25,8 +25,12 @@
 LDAPMessage *
 ldap_first_entry( LDAP *ld, LDAPMessage *chain )
 {
-       if( ld == NULL || chain == NULLMSG ) {
-               return NULLMSG;
+       assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
+       assert( chain != NULL );
+
+       if( ld == NULL || chain == NULL ) {
+               return NULL;
        }
 
        return chain->lm_msgtype == LDAP_RES_SEARCH_ENTRY
@@ -34,17 +38,20 @@ ldap_first_entry( LDAP *ld, LDAPMessage *chain )
                : ldap_next_entry( ld, chain );
 }
 
-/* ARGSUSED */
 LDAPMessage *
 ldap_next_entry( LDAP *ld, LDAPMessage *entry )
 {
-       if ( ld == NULL || entry == NULLMSG ) {
-               return NULLMSG;
+       assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
+       assert( entry != NULL );
+
+       if ( ld == NULL || entry == NULL ) {
+               return NULL;
        }
 
        for (
                entry = entry->lm_chain;
-               entry != NULLMSG;
+               entry != NULL;
                entry = entry->lm_chain )
        {
                if( entry->lm_msgtype == LDAP_RES_SEARCH_ENTRY ) {
@@ -52,15 +59,17 @@ ldap_next_entry( LDAP *ld, LDAPMessage *entry )
                }
        }
 
-       return( NULLMSG );
+       return( NULL );
 }
 
-/* ARGSUSED */
 int
 ldap_count_entries( LDAP *ld, LDAPMessage *chain )
 {
        int     i;
 
+       assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
+
        if ( ld == NULL ) {
                return -1;
        }
@@ -78,12 +87,17 @@ int
 ldap_get_entry_controls(
        LDAP *ld,
        LDAPMessage *entry, 
-       LDAPControl ***serverctrls)
+       LDAPControl ***sctrls )
 {
        int rc;
        BerElement be;
 
-       if ( ld == NULL || serverctrls == NULL ||
+       assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
+       assert( entry != NULL );
+       assert( sctrls != NULL );
+
+       if ( ld == NULL || sctrls == NULL ||
                entry == NULL || entry->lm_msgtype == LDAP_RES_SEARCH_ENTRY )
        {
                return LDAP_PARAM_ERROR;
@@ -97,21 +111,21 @@ ldap_get_entry_controls(
                goto cleanup_and_return;
        }
 
-       rc = ldap_int_get_controls( &be, serverctrls );
+       rc = ldap_int_get_controls( &be, sctrls );
 
 cleanup_and_return:
        if( rc != LDAP_SUCCESS ) {
                ld->ld_errno = rc;
 
-               if( ld->ld_matched != NULL )
-                       free( ld->ld_matched );
-
-               ld->ld_matched = NULL;
-
-               if( ld->ld_error != NULL )
-                       free( ld->ld_error );
+               if( ld->ld_matched != NULL ) {
+                       LDAP_FREE( ld->ld_matched );
+                       ld->ld_matched = NULL;
+               }
 
-               ld->ld_error = NULL;
+               if( ld->ld_error != NULL ) {
+                       LDAP_FREE( ld->ld_error );
+                       ld->ld_error = NULL;
+               }
        }
 
        return rc;