patrickallaert Sun Jun 7 13:07:58 2009 UTC
Modified files: (Branch: PHP_5_3)
/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.11.2.25&r2=1.161.2.3.2.11.2.26&diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.25
php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.26
--- php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.25 Tue Apr 21 18:08:34 2009
+++ php-src/ext/ldap/ldap.c Sun Jun 7 13:07:58 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.11.2.25 2009/04/21 18:08:34 bjori Exp $ */
+/* $Id: ldap.c,v 1.161.2.3.2.11.2.26 2009/06/07 13:07:58 patrickallaert Exp $
*/
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -224,7 +225,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.11.2.25 2009/04/21 18:08:34 bjori Exp $");
+ php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v
1.161.2.3.2.11.2.26 2009/06/07 13:07:58 patrickallaert Exp $");
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links));
@@ -961,9 +962,6 @@
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();
}
@@ -974,6 +972,9 @@
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
