From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 5 Dec 2003 19:54:42 +0000 (+0000)
Subject: ITS#2861 fix: don't try to dup a NULL reqdata...
X-Git-Tag: OPENLDAP_REL_ENG_2_1_MP~273
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fc11d8312c1e94ee12debcaee90794410f0dd127;p=openldap

ITS#2861 fix: don't try to dup a NULL reqdata...
---

diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c
index b649d9cc44..9334adfeb4 100644
--- a/servers/slapd/passwd.c
+++ b/servers/slapd/passwd.c
@@ -45,8 +45,13 @@ int passwd_extop(
 		return LDAP_STRONG_AUTH_REQUIRED;
 	}
 
-	ber_dupbv_x( &tmpbv, op->oq_extended.rs_reqdata, op->o_tmpmemctx );
-	rs->sr_err = slap_passwd_parse( &tmpbv, &id, &old, &new, &rs->sr_text );
+	if( op->oq_extended.rs_reqdata ) {
+		ber_dupbv_x( &tmpbv, op->oq_extended.rs_reqdata, op->o_tmpmemctx );
+	}
+	rs->sr_err = slap_passwd_parse(
+		op->oq_extended.rs_reqdata ? &tmpbv : NULL,
+		&id, &old, &new, &rs->sr_text );
+
 	if ( rs->sr_err != LDAP_SUCCESS ) {
 		return rs->sr_err;
 	}
@@ -183,7 +188,7 @@ int slap_passwd_parse( struct berval *reqdata,
 {
 	int rc = LDAP_SUCCESS;
 	ber_tag_t tag;
-	ber_len_t len;
+	ber_len_t len = -1;
 	BerElementBuffer berbuf;
 	BerElement *ber = (BerElement *)&berbuf;
 
@@ -201,10 +206,19 @@ int slap_passwd_parse( struct berval *reqdata,
 
 	tag = ber_scanf( ber, "{" /*}*/ );
 
-	if( tag != LBER_ERROR ) {
-		tag = ber_peek_tag( ber, &len );
+	if( tag == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( OPERATION, ERR, 
+			"slap_passwd_parse: decoding error\n", 0, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_TRACE,
+			"slap_passwd_parse: decoding error\n", 0, 0, 0 );
+#endif
+		rc = LDAP_PROTOCOL_ERROR;
+		goto done;
 	}
 
+	tag = ber_peek_tag( ber, &len );
 	if( tag == LDAP_TAG_EXOP_MODIFY_PASSWD_ID ) {
 		if( id == NULL ) {
 #ifdef NEW_LOGGING