Refix for ITS#1721. Return LDAP_PROTOCOL_ERROR when reqdata is empty.

diff --git a/CHANGES b/CHANGES
index d4e520e8caa4738ca7fd324599e0298f77de684a..0ec8b2278d9a9f3b873d94dd38afd7fcec0be62a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,7 @@
 OpenLDAP 2.0 Change Log
 
 OpenLDAP 2.0.25 Engineering
-       <insert changes here>
+       Fixed slapd extended op reqdata crash bug
 
 OpenLDAP 2.0.24 Release
        Fixed slapd max incoming macro bug (ITS#1828)

diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c
index 6cc9a6bb1b35c3c4652a8b88d3d105b5bf7881b2..628ae24c78a67708c920eb4a18809d041aa253fb 100644 (file)
--- a/servers/slapd/passwd.c
+++ b/servers/slapd/passwd.c
@@ -86,6 +86,11 @@ int slap_passwd_parse( struct berval *reqdata,
                return LDAP_SUCCESS;
        }
 
+       if( reqdata->bv_len == 0 ) {
+               *text = "empty request data field";
+               return LDAP_PROTOCOL_ERROR;
+       }
+
        ber = ber_init( reqdata );
 
        if( ber == NULL ) {