patrickallaert          Sun Jun  7 13:06:04 2009 UTC

  Modified files:              
    /php-src/ext/ldap   ldap.c 
  Log:
  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.198&r2=1.199&diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.198 php-src/ext/ldap/ldap.c:1.199
--- php-src/ext/ldap/ldap.c:1.198       Tue Apr 21 18:07:42 2009
+++ php-src/ext/ldap/ldap.c     Sun Jun  7 13:06:03 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.198 2009/04/21 18:07:42 bjori Exp $ */
+/* $Id: ldap.c,v 1.199 2009/06/07 13:06:03 patrickallaert Exp $ */
 #define IS_EXT_MODULE
 
 #ifdef HAVE_CONFIG_H
@@ -235,7 +236,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.198 
2009/04/21 18:07:42 bjori Exp $");
+       php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.199 
2009/06/07 13:06:03 patrickallaert Exp $");
 
        if (LDAPG(max_links) == -1) {
                snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links));
@@ -972,9 +973,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();
        }
@@ -985,6 +983,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

Reply via email to