ITS#3755 silence strict-aliasing warnings

[openldap] / libraries / libldap / sortctrl.c

diff --git a/libraries/libldap/sortctrl.c b/libraries/libldap/sortctrl.c
index a2bd69a2fb7a1245f1b67bea1ff98135035ba47b..0594018cea975f33bfc37425dbd6ccd685634350 100644 (file)
--- a/libraries/libldap/sortctrl.c
+++ b/libraries/libldap/sortctrl.c
@@ -27,9 +27,6 @@
  * can be found in the file "build/LICENSE-2.0.1" in this distribution
  * of OpenLDAP Software.
  */
-/* Portions Copyright (C) The Internet Society (1997)
- * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
- */
 
 #include "portable.h"
 
@@ -296,13 +293,15 @@ ldap_create_sort_control_value(
        BerElement      *ber = NULL;
        ber_tag_t       tag;
 
-       if ( ld == NULL || keyList == NULL || value == NULL ) {
+       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 ld->ld_errno;
+               return LDAP_PARAM_ERROR;
        }
 
-       assert( LDAP_VALID( ld ) );
-
        value->bv_val = NULL;
        value->bv_len = 0;
 
@@ -409,7 +408,12 @@ ldap_create_sort_control(
        LDAPControl **ctrlp )
 {
        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;
@@ -417,13 +421,19 @@ ldap_create_sort_control(
 
        ld->ld_errno = ldap_create_sort_control_value( ld, keyList, &value );
        if ( ld->ld_errno == LDAP_SUCCESS ) {
+               if ((ber = ldap_alloc_ber_with_options(ld)) == NULL) {
+                       ld->ld_errno = LDAP_NO_MEMORY;
+                       return LDAP_NO_MEMORY;
+               }
+       
                ld->ld_errno = ldap_create_control( LDAP_CONTROL_SORTREQUEST,
-                       NULL, isCritical, ctrlp );
+                       ber, isCritical, ctrlp );
                if ( ld->ld_errno == LDAP_SUCCESS ) {
                        (*ctrlp)->ldctl_value = value;
                } else {
                        LDAP_FREE( value.bv_val );
                }
+               ber_free(ber, 1);
        }
 
        return ld->ld_errno;
@@ -479,18 +489,20 @@ ldap_create_sort_control(
 
 int
 ldap_parse_sortresponse_control(
-       LDAP           *ld,
-       LDAPControl    *ctrl,
-       unsigned long  *returnCode,
-       char           **attribute )
+       LDAP *ld,
+       LDAPControl *ctrl,
+       ber_int_t *returnCode,
+       char **attribute )
 {
        BerElement *ber;
        ber_tag_t tag, berTag;
        ber_len_t berLen;
 
+       assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
+
        if (ld == NULL) {
-               ld->ld_errno = LDAP_PARAM_ERROR;
-               return(ld->ld_errno);
+               return LDAP_PARAM_ERROR;
        }
 
        if (ctrl == NULL) {