Update msgpack_convert_long_to_properties to properly detect keys

Author: Sean-Der

msgpack.c

@@ -124,19 +124,15 @@ static ZEND_MINFO_FUNCTION(msgpack)
 }
 
 zend_module_entry msgpack_module_entry = {
-#if ZEND_MODULE_API_NO >= 20010901
     STANDARD_MODULE_HEADER,
-#endif
     "msgpack",
     msgpack_functions,
     ZEND_MINIT(msgpack),
     ZEND_MSHUTDOWN(msgpack),
     NULL,
     NULL,
     ZEND_MINFO(msgpack),
-#if ZEND_MODULE_API_NO >= 20010901
     PHP_MSGPACK_VERSION,
-#endif
     STANDARD_MODULE_PROPERTIES
 };
 
@@ -192,13 +188,12 @@ PS_SERIALIZER_DECODE_FUNC(msgpack)
                 //unhandled non-string key
             }
         } ZEND_HASH_FOREACH_END();
+        zval_ptr_dtor(&tmp);
     }
     else {
         msgpack_unserialize_var_destroy(&var_hash, 1);
     }
 
-    zval_ptr_dtor(&tmp);
-
     return SUCCESS;
 }
 #endif
@@ -309,6 +304,6 @@ static ZEND_FUNCTION(msgpack_unserialize)
         if (msgpack_convert_template(return_value, object, &zv_p) != SUCCESS) {
             RETURN_NULL();
         }
-        zval_ptr_dtor(object);
+
     }
 }

msgpack_convert.c

@@ -11,20 +11,19 @@ inline int msgpack_convert_long_to_properties(
 {
     if (*properties != NULL) {
         zval *data, tplval, *dataval, prop_key_zv;
-        zend_string *prop_key;
+        zend_string *prop_key, *unmangled_prop_key;
         ulong prop_key_index;
         const char *class_name, *prop_name;
         size_t prop_len;
 
         for (;; zend_hash_move_forward_ex(*properties, prop_pos)) {
             if (zend_hash_get_current_key_ex(*properties, &prop_key, &prop_key_index, prop_pos) == HASH_KEY_IS_STRING) {
                 zend_unmangle_property_name_ex(prop_key, &class_name, &prop_name, &prop_len);
+                ZVAL_NEW_STR(&prop_key_zv, prop_key);
+                unmangled_prop_key = zend_string_init(prop_name, prop_len, 0);
 
-                if (var == NULL || !zend_hash_exists(var, prop_key)) {
+                if (var == NULL || !zend_hash_exists(var, unmangled_prop_key)) {
                     if ((data = zend_hash_find(ht, prop_key)) != NULL) {
-                        prop_key = zend_string_init(prop_name, prop_len, 0);
-                        ZVAL_NEW_STR(&prop_key_zv, prop_key);
-
                         switch (Z_TYPE_P(data)) {
                             case IS_ARRAY:
                                 {
@@ -35,40 +34,40 @@ inline int msgpack_convert_long_to_properties(
                                         MSGPACK_WARNING("[msgpack] (%s) "
                                                 "can't get data value by index",
                                                 __FUNCTION__);
-                                        zend_string_release(prop_key);
+                                        zend_string_release(unmangled_prop_key);
                                         return FAILURE;
                                     }
 
                                     if (msgpack_convert_array(&tplval, data, &dataval) == SUCCESS) {
                                         zend_hash_move_forward_ex(*properties, prop_pos);
 
                                         zend_update_property(Z_OBJCE_P(object), object, prop_name, prop_len, &tplval);
-                                        zend_string_release(prop_key);
+                                        zend_string_release(unmangled_prop_key);
                                         return SUCCESS;
                                     }
-                                    zend_string_release(prop_key);
+                                    zend_string_release(unmangled_prop_key);
                                     return FAILURE;
                                 }
                             case IS_OBJECT:
                                 {
                                     if (msgpack_convert_object(&tplval, data, &val) == SUCCESS) {
                                         zend_hash_move_forward_ex(*properties, prop_pos);
                                         zend_update_property(Z_OBJCE_P(object), object, prop_name, prop_len, &tplval);
-                                        zend_string_release(prop_key);
+                                        zend_string_release(unmangled_prop_key);
                                         return SUCCESS;
                                     }
-                                    zend_string_release(prop_key);
+                                    zend_string_release(unmangled_prop_key);
                                     return FAILURE;
                                 }
                             default:
                                 zend_hash_move_forward_ex(*properties, prop_pos);
                                 zend_update_property(Z_OBJCE_P(object), object, prop_name, prop_len, val);
-                                zend_string_release(prop_key);
+                                zend_string_release(unmangled_prop_key);
                                 return SUCCESS;
                         }
                     }
                 }
-                zend_string_release(prop_key);
+                zend_string_release(unmangled_prop_key);
             } else {
                 break;
             }
@@ -345,9 +344,8 @@ int msgpack_convert_object(zval *return_value, zval *tpl, zval **value) {
     if (Z_TYPE_P(*value) == IS_OBJECT) {
         zend_class_entry *vce;
 
-        vce = Z_OBJCE_P(tpl);
-        if (strcmp(ce->name->val, vce->name->val) == 0)
-        {
+        vce = Z_OBJCE_P(*value);
+        if (zend_string_equals(ce->name, vce->name)) {
             *return_value = **value;
             zval_copy_ctor(return_value);
             zval_ptr_dtor(*value);

msgpack_unpack.c

@@ -544,15 +544,12 @@ int msgpack_unserialize_map_item(
                     }
 
                     *container = rval;
-
-
-                    if (type == MSGPACK_SERIALIZE_TYPE_OBJECT) {
-                        ZVAL_UNREF(*container);
-                    } else if (type == MSGPACK_SERIALIZE_TYPE_OBJECT_REFERENCE) {
+                    if (type == MSGPACK_SERIALIZE_TYPE_OBJECT_REFERENCE) {
                         ZVAL_MAKE_REF(*container);
                     }
-
-                    if (Z_REFCOUNTED_P(*container)) Z_TRY_ADDREF_P(*container);
+                    if (Z_REFCOUNTED_P(*container)) {
+                     Z_TRY_ADDREF_P(*container);
+                    }
 
 
                     MSGPACK_UNSERIALIZE_FINISH_MAP_ITEM(unpack, key, val);