cvs: php-src /ext/spl php_spl.c

helly Fri Apr 6 21:02:20 2007 UTC Modified files: /php-src/ext/spl php_spl.c Log: - Fix unicode issue (our string termination test checks both ending bytes instead of just one) http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.111&r2=1.112&diff_format=u Index: php-src/ext/spl/php_spl.c diff -u php-src/ext/spl/php_spl.c:1.111 php-src/ext/spl/php_spl.c:1.112 --- php-src/ext/spl/php_spl.c:1.111 Fri Apr 6 19:04:53 2007 +++ php-src/ext/spl/php_spl.c Fri Apr 6 21:02:20 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_spl.c,v 1.111 2007/04/06 19:04:53 helly Exp $ */ +/* $Id: php_spl.c,v 1.112 2007/04/06 21:02:20 helly Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -466,16 +466,18 @@ /* add object id to the hash to ensure uniqueness, for more reference look at bug #40091 */ zstr lc_name; size_t func_name_len = Z_UNISIZE(zfunc_name); - lc_name.v = Z_UNIVAL(zfunc_name).v = erealloc(Z_UNIVAL(zfunc_name).v, func_name_len + 1 + sizeof(long)); + lc_name.v = Z_UNIVAL(zfunc_name).v = erealloc(Z_UNIVAL(zfunc_name).v, func_name_len + 2 + sizeof(zend_object_handle)); memcpy(lc_name.s + func_name_len, &Z_OBJ_HANDLE_PP(obj_ptr), sizeof(zend_object_handle)); func_name_len += sizeof(zend_object_handle); - lc_name.s[func_name_len] = '\0'; alfi.obj = *obj_ptr; alfi.obj->refcount++; if (Z_TYPE(zfunc_name) == IS_UNICODE) { - Z_UNILEN(zfunc_name) = func_name_len / sizeof(UChar); + func_name_len /= sizeof(UChar); + Z_STRLEN(zfunc_name) = func_name_len; + lc_name.u[func_name_len] = '\0'; } else { - Z_UNILEN(zfunc_name) = func_name_len; + Z_STRLEN(zfunc_name) = func_name_len; + lc_name.s[func_name_len] = '\0'; } } else { alfi.obj = NULL;