From: Patrick Allaert <patrickallaert@php.net>
Date: Sun, 7 Jun 2009 13:14:30 +0000 (+0000)
Subject: MFH: Fixed bug #48469 (ldap_get_entries() memory leaks on empty search results)
X-Git-Tag: php-5.2.10RC2~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6555a5a93e08410f7820e2835d090762156fa5a6;p=php

MFH: Fixed bug #48469 (ldap_get_entries() memory leaks on empty search results)
---

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 38b4e89321..25c0309453 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -19,6 +19,7 @@
    |          Jani Taskinen  <sniper@iki.fi>                              |
    |          Stig Venaas    <venaas@uninett.no>                          |
    |          Doug Goldstein <cardoe@cardoe.com>                          |
+   |          Patrick Allaert <patrickallaert@php.net>                    |
    | PHP 4.0 updates:  Zeev Suraski <zeev@zend.com>                       |
    +----------------------------------------------------------------------+
  */
@@ -1057,15 +1058,15 @@ PHP_FUNCTION(ldap_get_entries)
 	ldap = ld->link;
 	num_entries = ldap_count_entries(ldap, ldap_result);
 
-	array_init(return_value);
-	add_assoc_long(return_value, "count", num_entries);
-
 	if (num_entries == 0) return;
 	num_entries = 0;
 	
 	ldap_result_entry = ldap_first_entry(ldap, ldap_result);
 	if (ldap_result_entry == NULL) RETURN_FALSE;
 
+	array_init(return_value);
+	add_assoc_long(return_value, "count", num_entries);
+
 	while (ldap_result_entry != NULL) {
 
 		MAKE_STD_ZVAL(tmp1);