From: Jani Taskinen <jani@php.net>
Date: Fri, 13 Jul 2007 02:00:39 +0000 (+0000)
Subject: MFH: - Make sure people call ldap_first_attribute() before ldap_next_attribute()
X-Git-Tag: php-5.2.4RC1~157
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3dff7a7dba9f2ae20854586836a59c7c37b0944a;p=php

MFH: - Make sure people call ldap_first_attribute() before ldap_next_attribute()
---

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 77a44dd8c8..4fb5febe1c 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -1165,6 +1165,11 @@ PHP_FUNCTION(ldap_next_attribute)
 	ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
 	ZEND_FETCH_RESOURCE(resultentry, ldap_resultentry *, result_entry, -1, "ldap result entry", le_result_entry);
 
+	if (resultentry->ber == NULL) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "called before calling ldap_first_attribute() or no attributes found in result entry");
+		RETURN_FALSE;
+	}
+
 	if ((attribute = ldap_next_attribute(ld->link, resultentry->data, resultentry->ber)) == NULL) {
 #if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP_10 || WINDOWS
 		if (resultentry->ber != NULL) {