diff options
| author | Patrick Allaert <patrickallaert@php.net> | 2009-06-07 13:07:58 +0000 |
|---|---|---|
| committer | Patrick Allaert <patrickallaert@php.net> | 2009-06-07 13:07:58 +0000 |
| commit | 10b559c28c1058fe729a705cc09acba4a2adc6c4 (patch) | |
| tree | 3f4e7561bcf116cac067e232f80b24e7cdb5cfeb /ext/ldap/ldap.c | |
| parent | 1fa3b21c15a291cf442138513849930d23e1a102 (diff) | |
| download | php-git-10b559c28c1058fe729a705cc09acba4a2adc6c4.tar.gz | |
MFH: Fixed bug #48469 (ldap_get_entries() memory leaks on empty search results)
Diffstat (limited to 'ext/ldap/ldap.c')
| -rw-r--r-- | ext/ldap/ldap.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index bb2489c53b..f7f4c02e5f 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> | +----------------------------------------------------------------------+ */ @@ -961,9 +962,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(); } @@ -974,6 +972,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); |