From: Sriram Natarajan <srinatar@php.net>
Date: Mon, 21 Dec 2009 20:39:48 +0000 (+0000)
Subject: Fixed bug #50540 (Crash within ldap_first_reference function)
X-Git-Tag: php-5.2.13RC1~89
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8bba716138c4b94b8ea47c84e9d6e972eb72f96;p=php

Fixed bug #50540 (Crash within ldap_first_reference function)
---

diff --git a/NEWS b/NEWS
index 132cbbd01c..d1a016ca6e 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ PHP                                                                        NEWS
 ?? ??? 2010, PHP 5.2.13
 - Fixed build of mysqli with MySQL 5.5.0-m2. (Andrey)
 
+- Fixed bug #50540 (Crash while running ldap_next_reference test cases).
+  (Sriram)
 - Fixed bug #50508 (compile failure: Conflicting HEADER type declarations).
   (Jani)
 - Fixed bug #50394 (Reference argument converted to value in __call). (Stas)
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 538ac7ce9f..77216e6bb1 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -2009,6 +2009,7 @@ PHP_FUNCTION(ldap_first_reference)
 		resultentry->id = Z_LVAL_PP(result);
 		zend_list_addref(resultentry->id);
 		resultentry->data = entry;
+		resultentry->ber = NULL;
 	}
 }
 /* }}} */
@@ -2037,6 +2038,7 @@ PHP_FUNCTION(ldap_next_reference)
 		resultentry_next->id = resultentry->id;
 		zend_list_addref(resultentry->id);
 		resultentry_next->data = entry_next;
+		resultentry_next->ber = NULL;
 	}
 }
 /* }}} */