More ldapbis cleanup

[openldap] / libraries / libldap / vlvctrl.c

diff --git a/libraries/libldap/vlvctrl.c b/libraries/libldap/vlvctrl.c
index edec49cccb90afa773a8f0b0436695e30269457b..cd3efba1398a8b866937c3c3079914ab14c3bcc0 100644 (file)
--- a/libraries/libldap/vlvctrl.c
+++ b/libraries/libldap/vlvctrl.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"
 
@@ -95,8 +92,9 @@ ldap_create_vlv_control_value(
        BerElement *ber;
 
        if ( ld == NULL || vlvinfop == NULL || value == NULL ) {
-               ld->ld_errno = LDAP_PARAM_ERROR;
-               return ld->ld_errno;
+               if ( ld )
+                       ld->ld_errno = LDAP_PARAM_ERROR;
+               return LDAP_PARAM_ERROR;
        }
 
        assert( LDAP_VALID( ld ) );
@@ -212,6 +210,7 @@ ldap_create_vlv_control(
        LDAPControl **ctrlp )
 {
        struct berval   value;
+       BerElement      *ber;
 
        if ( ctrlp == NULL ) {
                ld->ld_errno = LDAP_PARAM_ERROR;
@@ -220,13 +219,19 @@ ldap_create_vlv_control(
 
        ld->ld_errno = ldap_create_vlv_control_value( ld, vlvinfop, &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_VLVREQUEST,
-                       NULL, 1, ctrlp );
+                       ber, 1, 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;
@@ -297,7 +302,7 @@ ldap_parse_vlvresponse_control(
        ber_int_t *errcodep )
 {
        BerElement  *ber;
-       ber_int_t long pos, count, err;
+       ber_int_t pos, count, err;
        ber_tag_t tag, berTag;
        ber_len_t berLen;