ITS#4679 cleanup

Note: the caller is expected to pass in a valid LDAP handle.  If not,
the assert will trigger to let him know his code is broken.

diff --git a/libraries/libldap/sortctrl.c b/libraries/libldap/sortctrl.c
index b4e1f8591ed78ec958cce7ae160e05aef1b7692b..185046167210961c320f7f947c90a62eab58caa9 100644 (file)
--- a/libraries/libldap/sortctrl.c
+++ b/libraries/libldap/sortctrl.c
@@ -296,14 +296,15 @@ ldap_create_sort_control_value(
        BerElement      *ber = NULL;
        ber_tag_t       tag;
 
-       if ( ld == NULL || keyList == NULL || value == NULL ) {
-               if ( ld )
-                       ld->ld_errno = LDAP_PARAM_ERROR;
+       assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
+
+       if ( ld == NULL ) return LDAP_PARAM_ERROR;
+       if ( keyList == NULL || value == NULL ) {
+               ld->ld_errno = LDAP_PARAM_ERROR;
                return LDAP_PARAM_ERROR;
        }
 
-       assert( LDAP_VALID( ld ) );
-
        value->bv_val = NULL;
        value->bv_len = 0;
 
@@ -412,6 +413,10 @@ ldap_create_sort_control(
        struct berval   value;
        BerElement      *ber;
 
+       assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
+
+       if ( ld == NULL ) return LDAP_PARAM_ERROR;
        if ( ctrlp == NULL ) {
                ld->ld_errno = LDAP_PARAM_ERROR;
                return ld->ld_errno;
@@ -496,6 +501,9 @@ ldap_parse_sortresponse_control(
        ber_tag_t tag, berTag;
        ber_len_t berLen;
 
+       assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
+
        if (ld == NULL) {
                return LDAP_PARAM_ERROR;
        }