cvs: php-src(PHP_5_2) / NEWS /ext/spl php_spl.c

cellog Sat Jun 13 17:35:38 2009 UTC Modified files: (Branch: PHP_5_2) /php-src NEWS /php-src/ext/spl php_spl.c Log: fix missing erealloc in fix for bug #40091, spl_autoload_register of more than 1 copy of the same method in different objects http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1555&r2=1.2027.2.547.2.1556&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1555 php-src/NEWS:1.2027.2.547.2.1556 --- php-src/NEWS:1.2027.2.547.2.1555 Fri Jun 12 20:50:58 2009 +++ php-src/NEWS Sat Jun 13 17:35:37 2009 @@ -3,6 +3,8 @@ ?? Jun 2009, PHP 5.2.10 - Fixed bug #48514 (cURL extension uses same resource name for simple and multi APIs). (Felipe) +- Fixed missing erealloc() in fix for Bug #40091 in spl_autoload_register. + (Greg) 11 Jun 2009, PHP 5.2.10RC2 - Updated timezone database to version 2009.9 (2009i) (Derick) http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.52.2.28.2.20&r2=1.52.2.28.2.21&diff_format=u Index: php-src/ext/spl/php_spl.c diff -u php-src/ext/spl/php_spl.c:1.52.2.28.2.20 php-src/ext/spl/php_spl.c:1.52.2.28.2.21 --- php-src/ext/spl/php_spl.c:1.52.2.28.2.20 Wed Dec 31 11:17:43 2008 +++ php-src/ext/spl/php_spl.c Sat Jun 13 17:35:37 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_spl.c,v 1.52.2.28.2.20 2008/12/31 11:17:43 sebastian Exp $ */ +/* $Id: php_spl.c,v 1.52.2.28.2.21 2009/06/13 17:35:37 cellog Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -464,6 +464,7 @@ if (obj_ptr && !(alfi.func_ptr->common.fn_flags & ZEND_ACC_STATIC)) { /* add object id to the hash to ensure uniqueness, for more reference look at bug #40091 */ + lc_name = erealloc(lc_name, func_name_len + 2 + sizeof(zend_object_handle)); memcpy(lc_name + func_name_len, &Z_OBJ_HANDLE_PP(obj_ptr), sizeof(zend_object_handle)); func_name_len += sizeof(zend_object_handle); lc_name[func_name_len] = '\0';