Fixed bug #63980 (object members get trimmed by zero bytes)

diff --git a/NEWS b/NEWS
index e79501f679214655dcb39e379c3005476b8e9622..c31365e9214a9fd8336469371b430e4f6fd3ec1b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 201?, PHP 5.5.0 Alpha 3
 
+- Core:
+  . Fixed bug #63980 (object members get trimmed by zero bytes). (Laruence)
+
 - General improvements:
   . Fixed bug #63874 (Segfault if php_strip_whitespace has heredoc). (Pierrick)
   . Fixed bug #63822 (Crash when using closures with ArrayAccess).

diff --git a/Zend/zend.c b/Zend/zend.c
index d71d7cb5c8f40f26d80d8accfa3b5f197a989b67..aad6165e408a3997a1d42e9d4679eed4840a8c9e 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -158,9 +158,10 @@ static void print_hash(zend_write_func_t write_func, HashTable *ht, int indent,
                        case HASH_KEY_IS_STRING:
                                if (is_object) {
                                        const char *prop_name, *class_name;
-                                       int mangled = zend_unmangle_property_name(string_key, str_len - 1, &class_name, &prop_name);
+                                       int prop_len;
+                                       int mangled = zend_unmangle_property_name_ex(string_key, str_len - 1, &class_name, &prop_name, &prop_len);
 
-                                       ZEND_PUTS_EX(prop_name);
+                                       ZEND_WRITE_EX(prop_name, prop_len);
                                        if (class_name && mangled == SUCCESS) {
                                                if (class_name[0]=='*') {
                                                        ZEND_PUTS_EX(":protected");

diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 7bbb04785efc88c1c9734a2678cc50e3afb7e8eb..4d950a203b31e19802008c63e6da3dff936f5bd1 100644 (file)
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -987,7 +987,7 @@ ZEND_FUNCTION(get_object_vars)
        HashPosition pos;
        char *key;
        const char *prop_name, *class_name;
-       uint key_len;
+       uint key_len, prop_len;
        ulong num_index;
        zend_object *zobj;
 
@@ -1014,10 +1014,10 @@ ZEND_FUNCTION(get_object_vars)
        while (zend_hash_get_current_data_ex(properties, (void **) &value, &pos) == SUCCESS) {
                if (zend_hash_get_current_key_ex(properties, &key, &key_len, &num_index, 0, &pos) == HASH_KEY_IS_STRING) {
                        if (zend_check_property_access(zobj, key, key_len-1 TSRMLS_CC) == SUCCESS) {
-                               zend_unmangle_property_name(key, key_len-1, &class_name, &prop_name);
+                               zend_unmangle_property_name_ex(key, key_len - 1, &class_name, &prop_name, &prop_len);
                                /* Not separating references */
                                Z_ADDREF_PP(value);
-                               add_assoc_zval_ex(return_value, prop_name, strlen(prop_name)+1, *value);
+                               add_assoc_zval_ex(return_value, prop_name, prop_len + 1, *value);
                        }
                }
                zend_hash_move_forward_ex(properties, &pos);

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 101662cfe79d834f97a44c4cfbcec359113d5766..a5d6add5512a4c665e3942f0a35a4c2dbcc676e4 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -5178,7 +5178,7 @@ static int zend_strnlen(const char* s, int maxlen) /* {{{ */
 }
 /* }}} */
 
-ZEND_API int zend_unmangle_property_name(const char *mangled_property, int len, const char **class_name, const char **prop_name) /* {{{ */
+ZEND_API int zend_unmangle_property_name_ex(const char *mangled_property, int len, const char **class_name, const char **prop_name, int *prop_len) /* {{{ */
 {
        int class_name_len;
 
@@ -5186,22 +5186,34 @@ ZEND_API int zend_unmangle_property_name(const char *mangled_property, int len,
 
        if (mangled_property[0]!=0) {
                *prop_name = mangled_property;
+               if (prop_len) {
+                       *prop_len = len;
+               }
                return SUCCESS;
        }
        if (len < 3 || mangled_property[1]==0) {
                zend_error(E_NOTICE, "Illegal member variable name");
                *prop_name = mangled_property;
+               if (prop_len) {
+                       *prop_len = len;
+               }
                return FAILURE;
        }
 
-       class_name_len = zend_strnlen(mangled_property+1, --len - 1) + 1;
+       class_name_len = zend_strnlen(mangled_property + 1, --len - 1) + 1;
        if (class_name_len >= len || mangled_property[class_name_len]!=0) {
                zend_error(E_NOTICE, "Corrupt member variable name");
                *prop_name = mangled_property;
+               if (prop_len) {
+                       *prop_len = len + 1;
+               }
                return FAILURE;
        }
-       *class_name = mangled_property+1;
-       *prop_name = (*class_name)+class_name_len;
+       *class_name = mangled_property + 1;
+       *prop_name = (*class_name) + class_name_len;
+       if (prop_len) {
+               *prop_len = len - class_name_len;
+       }
        return SUCCESS;
 }
 /* }}} */

diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index d2ab0607b5b577b65dabe54458167ee2603eae17..0f58b5550041e78f426701ed74bdabf29a245b27 100644 (file)
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -671,7 +671,9 @@ ZEND_API void destroy_zend_class(zend_class_entry **pce);
 void zend_class_add_ref(zend_class_entry **ce);
 
 ZEND_API void zend_mangle_property_name(char **dest, int *dest_length, const char *src1, int src1_length, const char *src2, int src2_length, int internal);
-ZEND_API int zend_unmangle_property_name(const char *mangled_property, int mangled_property_len, const char **class_name, const char **prop_name);
+#define zend_unmangle_property_name(mangled_property, mangled_property_len, class_name, prop_name) \
+        zend_unmangle_property_name_ex(mangled_property, mangled_property_len, class_name, prop_name, NULL) 
+ZEND_API int zend_unmangle_property_name_ex(const char *mangled_property, int mangled_property_len, const char **class_name, const char **prop_name, int *prop_len);
 
 #define ZEND_FUNCTION_DTOR (void (*)(void *)) zend_function_dtor
 #define ZEND_CLASS_DTOR (void (*)(void *)) destroy_zend_class

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 82826c904a4f5fb59289fffce5be928e62dbefe0..3f9cc126ed9b22b04228c03843a170be3fe23610 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -4266,8 +4266,7 @@ ZEND_VM_HANDLER(78, ZEND_FE_FETCH, VAR, ANY)
                                  zend_check_property_access(zobj, str_key, str_key_len-1 TSRMLS_CC) != SUCCESS));
                        zend_hash_get_pointer(fe_ht, &EX_T(opline->op1.var).fe.fe_pos);
                        if (use_key && key_type != HASH_KEY_IS_LONG) {
-                               zend_unmangle_property_name(str_key, str_key_len-1, &class_name, &prop_name);
-                               str_key_len = strlen(prop_name);
+                               zend_unmangle_property_name_ex(str_key, str_key_len-1, &class_name, &prop_name, &str_key_len);
                                str_key = estrndup(prop_name, str_key_len);
                                str_key_len++;
                        }

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 23f6187ae7d951d8e5579a29885606b9b49208d2..614249f9934a38f0a06dfb26721960e9fcc202fd 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -13565,8 +13565,7 @@ static int ZEND_FASTCALL  ZEND_FE_FETCH_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG
                                  zend_check_property_access(zobj, str_key, str_key_len-1 TSRMLS_CC) != SUCCESS));
                        zend_hash_get_pointer(fe_ht, &EX_T(opline->op1.var).fe.fe_pos);
                        if (use_key && key_type != HASH_KEY_IS_LONG) {
-                               zend_unmangle_property_name(str_key, str_key_len-1, &class_name, &prop_name);
-                               str_key_len = strlen(prop_name);
+                               zend_unmangle_property_name_ex(str_key, str_key_len-1, &class_name, &prop_name, &str_key_len);
                                str_key = estrndup(prop_name, str_key_len);
                                str_key_len++;
                        }