From 4868360f1c90d31f9ea72b7eda1fee05de486ba4 Mon Sep 17 00:00:00 2001 From: Marcus Boerger Date: Fri, 6 Apr 2007 21:07:48 +0000 Subject: [PATCH] - Fix unicode issue in unregister according to register solution --- ext/spl/php_spl.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index bd54d0c444..ba81f17f1e 100755 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -474,7 +474,7 @@ PHP_FUNCTION(spl_autoload_register) if (Z_TYPE(zfunc_name) == IS_UNICODE) { func_name_len /= sizeof(UChar); Z_STRLEN(zfunc_name) = func_name_len; - lc_name.u[func_name_len] = '\0'; + lc_name.u[func_name_len] = 0; } else { Z_STRLEN(zfunc_name) = func_name_len; lc_name.s[func_name_len] = '\0'; @@ -548,12 +548,14 @@ PHP_FUNCTION(spl_autoload_unregister) success = zend_u_hash_del(SPL_G(autoload_functions), Z_TYPE(zfunc_name), lc_name, Z_UNILEN(zfunc_name)+1); if (success != SUCCESS && obj_ptr) { size_t func_name_len = Z_UNISIZE(zfunc_name); - lc_name.v = erealloc(lc_name.v, func_name_len + 1 + sizeof(zend_object_handle)); + lc_name.v = erealloc(lc_name.v, func_name_len + 2 + sizeof(zend_object_handle)); memcpy(lc_name.v + 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'; if (Z_TYPE(zfunc_name) == IS_UNICODE) { func_name_len /= sizeof(UChar); + lc_name.u[func_name_len] = 0; + } else { + lc_name.s[func_name_len] = '\0'; } success = zend_u_hash_del(SPL_G(autoload_functions), Z_TYPE(zfunc_name), lc_name, func_name_len+1); } -- 2.50.1