Always pass valid BerElement to ldap_create_control() to avoid assert fail

diff --git a/libraries/libldap/pagectrl.c b/libraries/libldap/pagectrl.c
index f5ca3a54ee6ecf68e0464b08fbf0decde492fd78..40093cb6fd5ed48ead9b6d6d3d8cd16b6a1a9ace 100644 (file)
--- a/libraries/libldap/pagectrl.c
+++ b/libraries/libldap/pagectrl.c
@@ -141,6 +141,7 @@ ldap_create_page_control(
        LDAPControl     **ctrlp )
 {
        struct berval   value;
+       BerElement      *ber;
 
        if ( ctrlp == NULL ) {
                ld->ld_errno = LDAP_PARAM_ERROR;
@@ -150,13 +151,19 @@ ldap_create_page_control(
        ld->ld_errno = ldap_create_page_control_value( ld,
                pagesize, cookie, &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_PAGEDRESULTS,
-                       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;

diff --git a/libraries/libldap/sortctrl.c b/libraries/libldap/sortctrl.c
index f4c881af7b5777712e4f42ef3ecdc3e6e24fce84..3875387e211e373c72d19ae6aa6f9c9c38070b6d 100644 (file)
--- a/libraries/libldap/sortctrl.c
+++ b/libraries/libldap/sortctrl.c
@@ -409,6 +409,7 @@ ldap_create_sort_control(
        LDAPControl **ctrlp )
 {
        struct berval   value;
+       BerElement      *ber;
 
        if ( ctrlp == NULL ) {
                ld->ld_errno = LDAP_PARAM_ERROR;
@@ -417,13 +418,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;

diff --git a/libraries/libldap/vlvctrl.c b/libraries/libldap/vlvctrl.c
index 6f4feeb805fb52588a64bff2897a5d9460c7a194..ab731007cd14aedb6785247701945a5972170efd 100644 (file)
--- a/libraries/libldap/vlvctrl.c
+++ b/libraries/libldap/vlvctrl.c
@@ -212,6 +212,7 @@ ldap_create_vlv_control(
        LDAPControl **ctrlp )
 {
        struct berval   value;
+       BerElement      *ber;
 
        if ( ctrlp == NULL ) {
                ld->ld_errno = LDAP_PARAM_ERROR;
@@ -220,13 +221,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;