X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fextended.c;h=f42afd281aaba1e3856b81ac6635ecf346905371;hb=bcf8f7eeb788faa25efe0ea78e66e83e9d9b4d73;hp=e284b485fdd63e31d3d13dcf7ea911e839cd7aba;hpb=403f4479bc9f9a864122d4aeecf7284408918302;p=openldap

diff --git a/libraries/libldap/extended.c b/libraries/libldap/extended.c
index e284b485fd..f42afd281a 100644
--- a/libraries/libldap/extended.c
+++ b/libraries/libldap/extended.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -181,7 +181,7 @@ ldap_parse_extended_result (
 		return ld->ld_errno;
 	}
 
-	if( res->lm_msgtype == LDAP_RES_EXTENDED ) {
+	if( res->lm_msgtype != LDAP_RES_EXTENDED ) {
 		ld->ld_errno = LDAP_PARAM_ERROR;
 		return ld->ld_errno;
 	}
@@ -189,8 +189,6 @@ ldap_parse_extended_result (
 	if( retoidp != NULL ) *retoidp = NULL;
 	if( retdatap != NULL ) *retdatap = NULL;
 
-	ber = ber_dup( res->lm_ber );
-
 	if ( ld->ld_error ) {
 		LDAP_FREE( ld->ld_error );
 		ld->ld_error = NULL;
@@ -201,8 +199,15 @@ ldap_parse_extended_result (
 		ld->ld_matched = NULL;
 	}
 
+	ber = ber_dup( res->lm_ber );
+
+	if ( ber == NULL ) {
+		ld->ld_errno = LDAP_NO_MEMORY;
+		return ld->ld_errno;
+	}
+
 	rc = ber_scanf( ber, "{iaa" /*}*/, &errcode,
-		&ld->ld_matched, &ld->ld_matched );
+		&ld->ld_matched, &ld->ld_error );
 
 	if( rc == LBER_ERROR ) {
 		ld->ld_errno = LDAP_DECODING_ERROR;
@@ -217,11 +222,13 @@ ldap_parse_extended_result (
 
 	if( tag == LDAP_TAG_REFERRAL ) {
 		/* skip over referral */
-		tag = ber_scanf( ber, "x" );
-
-		if( tag != LBER_ERROR ) {
-			tag = ber_peek_tag( ber, &len );
+		if( ber_scanf( ber, "x" ) == LBER_ERROR ) {
+			ld->ld_errno = LDAP_DECODING_ERROR;
+			ber_free( ber, 0 );
+			return ld->ld_errno;
 		}
+
+		tag = ber_peek_tag( ber, &len );
 	}
 
 	if( tag == LDAP_TAG_EXOP_RES_OID ) {
@@ -237,7 +244,7 @@ ldap_parse_extended_result (
 
 	if( tag == LDAP_TAG_EXOP_RES_VALUE ) {
 		/* we have a resdata */
-		if( ber_scanf( ber, "O", &resoid ) == LBER_ERROR ) {
+		if( ber_scanf( ber, "O", &resdata ) == LBER_ERROR ) {
 			ld->ld_errno = LDAP_DECODING_ERROR;
 			ber_free( ber, 0 );
 			if( resoid != NULL ) LDAP_FREE( resoid );
@@ -245,6 +252,8 @@ ldap_parse_extended_result (
 		}
 	}
 
+	ber_free( ber, 0 );
+
 	if( retoidp != NULL ) {
 		*retoidp = resoid;
 	} else {