Fix UTF8StringNormalize overrun on zero-length string

[openldap] / libraries / libldap / pagectrl.c

diff --git a/libraries/libldap/pagectrl.c b/libraries/libldap/pagectrl.c
index 93222406b18421edb8e389b609a5f460b5f585fc..3df27acf3bb27a9216f551f2ff5b9f6e895d320f 100644 (file)
--- a/libraries/libldap/pagectrl.c
+++ b/libraries/libldap/pagectrl.c
@@ -1,6 +1,7 @@
+/* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2011 The OpenLDAP Foundation.
  * Copyright 2006 Hans Leidekker
  * All rights reserved.
  *
@@ -71,6 +72,7 @@ ldap_create_page_control_value(
 
        value->bv_val = NULL;
        value->bv_len = 0;
+       ld->ld_errno = LDAP_SUCCESS;
 
        if ( cookie == NULL ) {
                cookie = &null_cookie;
@@ -256,7 +258,7 @@ ldap_parse_page_control(
 
        ld->ld_errno = ldap_parse_pageresponse_control( ld, c, countp, &cookie );
        if ( ld->ld_errno == LDAP_SUCCESS ) {
-               *cookiep = LDAP_MALLOC( sizeof( struct berval * ) );
+               *cookiep = LDAP_MALLOC( sizeof( struct berval ) );
                if ( *cookiep == NULL ) {
                        ld->ld_errno = LDAP_NO_MEMORY;
                } else {