From e2d2ce43ad6f024b8168f8edf989fc6d57e7af50 Mon Sep 17 00:00:00 2001
From: Patrick Allaert <patrickallaert@php.net>
Date: Sun, 7 Jun 2009 13:06:03 +0000
Subject: [PATCH] Fixed bug #48469 (ldap_get_entries() memory leaks on empty
 search results)

---
 ext/ldap/ldap.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 12b7c23888..db10408176 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>                       |
    +----------------------------------------------------------------------+
  */
@@ -972,9 +973,6 @@ 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_NULL();
 	}
@@ -985,6 +983,9 @@ PHP_FUNCTION(ldap_get_entries)
 		RETURN_FALSE;
 	}
 
+	array_init(return_value);
+	add_assoc_long(return_value, "count", num_entries);
+
 	while (ldap_result_entry != NULL) {
 
 		MAKE_STD_ZVAL(tmp1);
-- 
2.50.1