diff options
| author | Greg Beaver <cellog@php.net> | 2009-06-13 17:35:37 +0000 |
|---|---|---|
| committer | Greg Beaver <cellog@php.net> | 2009-06-13 17:35:37 +0000 |
| commit | aac2b9464d49c10c2fe26cbdf59a5c1978cdd7c0 (patch) | |
| tree | d8458630cd49ced47d4cc426cf9ca28563846d0d | |
| parent | 946c404c5db71e9b082cd9848d178e66412505f5 (diff) | |
| download | php-git-aac2b9464d49c10c2fe26cbdf59a5c1978cdd7c0.tar.gz | |
fix missing erealloc in fix for bug #40091, spl_autoload_register of more than 1 copy of the same method in different objects
| -rw-r--r-- | NEWS | 2 | ||||
| -rwxr-xr-x | ext/spl/php_spl.c | 1 |
2 files changed, 3 insertions, 0 deletions
@@ -3,6 +3,8 @@ PHP NEWS ?? 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) diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index bf049368f9..eddb16f041 100755 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -464,6 +464,7 @@ PHP_FUNCTION(spl_autoload_register) 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'; |