patrickallaert Sun Jun 7 13:14:30 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/ldap ldap.c
Log:
MFH: Fixed bug #48469 (ldap_get_entries() memory leaks on empty search
results)
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.161.2.3.2.14&r2=1.161.2.3.2.15&diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.161.2.3.2.14
php-src/ext/ldap/ldap.c:1.161.2.3.2.15
--- php-src/ext/ldap/ldap.c:1.161.2.3.2.14 Wed Dec 31 11:17:39 2008
+++ php-src/ext/ldap/ldap.c Sun Jun 7 13:14:30 2009
@@ -19,11 +19,12 @@
| Jani Taskinen <sni...@iki.fi> |
| Stig Venaas <ven...@uninett.no> |
| Doug Goldstein <car...@cardoe.com> |
+ | Patrick Allaert <patrickalla...@php.net> |
| PHP 4.0 updates: Zeev Suraski <z...@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: ldap.c,v 1.161.2.3.2.14 2008/12/31 11:17:39 sebastian Exp $ */
+/* $Id: ldap.c,v 1.161.2.3.2.15 2009/06/07 13:14:30 patrickallaert Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -322,7 +323,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "LDAP Support", "enabled");
- php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v
1.161.2.3.2.14 2008/12/31 11:17:39 sebastian Exp $");
+ php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v
1.161.2.3.2.15 2009/06/07 13:14:30 patrickallaert Exp $");
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links));
@@ -1057,15 +1058,15 @@
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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
