Fixed issue #23 (Empty objects get serialized with incorrect type)

msgpack · Nov 19, 2013 · 1a9d248 · 1a9d248
1 parent 629676d
commit 1a9d248
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 29 deletions.
diff --git a/msgpack_pack.c b/msgpack_pack.c
@@ -276,35 +276,28 @@ inline static void msgpack_serialize_array(
 
     if (object)
     {
-        if (n == 0)
-        {
-            msgpack_pack_map(buf, n);
-        }
-        else
-        {
-            if (MSGPACK_G(php_only))
-            {
-                if (Z_ISREF_P(val))
-                {
-                    msgpack_pack_map(buf, n + 2);
-                    msgpack_pack_nil(buf);
-                    msgpack_pack_long(buf, MSGPACK_SERIALIZE_TYPE_REFERENCE);
-                }
-                else
-                {
-                    msgpack_pack_map(buf, n + 1);
-                }
-
-                msgpack_pack_nil(buf);
-
-                msgpack_serialize_string(buf, class_name, name_len);
-            }
-            else
-            {
-                msgpack_pack_array(buf, n);
-                hash = 0;
-            }
-        }
+		if (MSGPACK_G(php_only))
+		{
+			if (Z_ISREF_P(val))
+			{
+				msgpack_pack_map(buf, n + 2);
+				msgpack_pack_nil(buf);
+				msgpack_pack_long(buf, MSGPACK_SERIALIZE_TYPE_REFERENCE);
+			}
+			else
+			{
+				msgpack_pack_map(buf, n + 1);
+			}
+
+			msgpack_pack_nil(buf);
+
+			msgpack_serialize_string(buf, class_name, name_len);
+		}
+		else
+		{
+			msgpack_pack_array(buf, n);
+			hash = 0;
+		}
     }
     else if (n == 0)
     {

diff --git a/tests/issue023.phpt b/tests/issue023.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Issue #23 (Empty objects get serialized with incorrect type)
+--SKIPIF--
+<?php
+if (!extension_loaded("msgpack")) {
+   echo "skip"; 
+}
+--FILE--
+<?php
+class test {} 
+print_r(msgpack_unserialize (msgpack_serialize (new test())));
+?>
+--EXPECTF--
+test Object
+(
+)