clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Patrick Allaert 2009-06-07 13:07:58 +00:00
parent 1fa3b21c15
commit 10b559c28c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ext/ldap/ldap.c
View File

@ -19,6 +19,7 @@
| Jani Taskinen <sniper@iki.fi> | | Jani Taskinen <sniper@iki.fi> |
| Stig Venaas <venaas@uninett.no> | | Stig Venaas <venaas@uninett.no> |
| Doug Goldstein <cardoe@cardoe.com> | | Doug Goldstein <cardoe@cardoe.com> |
| Patrick Allaert <patrickallaert@php.net> |
| PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
*/ */
@ -961,9 +962,6 @@ PHP_FUNCTION(ldap_get_entries)
ldap = ld->link; ldap = ld->link;
num_entries = ldap_count_entries(ldap, ldap_result); num_entries = ldap_count_entries(ldap, ldap_result);
array_init(return_value);
add_assoc_long(return_value, "count", num_entries);
if (num_entries == 0) { if (num_entries == 0) {
RETURN_NULL(); RETURN_NULL();
} }
@ -974,6 +972,9 @@ PHP_FUNCTION(ldap_get_entries)
RETURN_FALSE; RETURN_FALSE;
} }
array_init(return_value);
add_assoc_long(return_value, "count", num_entries);
while (ldap_result_entry != NULL) { while (ldap_result_entry != NULL) {
MAKE_STD_ZVAL(tmp1); MAKE_STD_ZVAL(tmp1);