fixing ldap memory leaks php#4

Author: ptomulik

ext/ldap/ldap.c

@@ -4318,6 +4318,13 @@ PHP_FUNCTION(ldap_exop_passwd)
 		goto cleanup;
 	}
 
+	rc = ldap_parse_result(ld->link, ldap_res, &err, NULL, &errmsg, NULL, (myargcount > 4 ? &lserverctrls : NULL), 0); /* memleak: ??? */
+	if( rc != LDAP_SUCCESS ) {
+		php_error_docref(NULL, E_WARNING, "Passwd modify extended operation failed: %s (%d)", ldap_err2string(rc), rc);
+		RETVAL_FALSE;
+		goto cleanup;
+	}
+
 	if (lnewpw.bv_len == 0) {
 		if (lgenpasswd.bv_len == 0) {
 			RETVAL_EMPTY_STRING();
@@ -4329,14 +4336,8 @@ PHP_FUNCTION(ldap_exop_passwd)
 	} else {
 		php_error_docref(NULL, E_WARNING, "Passwd modify extended operation failed: %s (%d)", (errmsg ? errmsg : ldap_err2string(err)), err);
 		RETVAL_FALSE;
-		goto cleanup;
-	}
-
-	rc = ldap_parse_result(ld->link, ldap_res, &err, NULL, &errmsg, NULL, (myargcount > 4 ? &lserverctrls : NULL), 0); /* memleak: ??? */
-	if( rc != LDAP_SUCCESS ) {
-		php_error_docref(NULL, E_WARNING, "Passwd modify extended operation failed: %s (%d)", ldap_err2string(rc), rc);
-		RETVAL_FALSE;
-		goto cleanup;
+		/* don't "goto cleanup" here, we need _php_ldap_controls_to_array() as it
+		 * releasesthe lserverctrls */
 	}
 
 	if (myargcount > 4) {