- Fix unicode issue in unregister according to register solution

diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c
index bd54d0c444a783abd1667124f10437e4bda1991a..ba81f17f1eeb82afb9ca295585ac26cef268c9cf 100755 (executable)
--- 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);
                        }