fix issue #81 and (part of) PR #135

Author: m6w6

msgpack_pack.c

@@ -228,7 +228,7 @@ static inline void msgpack_serialize_array(smart_str *buf, zval *val, HashTable
     }
 
     if (ht) {
-        n = zend_hash_num_elements(ht);
+        n = zend_array_count(ht);
     } else {
         n = 0;
     }
@@ -274,7 +274,7 @@ static inline void msgpack_serialize_array(smart_str *buf, zval *val, HashTable
             zend_ulong   key_long;
             zval *value, *value_noref;
 
-            ZEND_HASH_FOREACH_KEY_VAL(ht, key_long, key_str, value) {
+            ZEND_HASH_FOREACH_KEY_VAL_IND(ht, key_long, key_str, value) {
                 if (key_str && incomplete_class && strcmp(ZSTR_VAL(key_str), MAGIC_MEMBER) == 0) {
                     continue;
                 }

tests/issue081.phpt

@@ -0,0 +1,61 @@
+--TEST--
+Issue #81 (Ignore IS_UNDEF)
+--SKIPIF--
+<?php
+if (!extension_loaded("msgpack)) {
+    die("skip");
+}
+?>
+--FILE--
+<?php
+class MyClass
+{
+  private $first_field;
+  private $second_field;
+
+  public function __construct()
+  {
+    $this->first_field = 'first_field';
+    $this->second_field = 'second_field';
+  }
+
+  public function preSerialize()
+  {
+    unset($this->first_field);
+  }
+}
+
+$t = new MyClass();
+var_dump($t);
+var_dump(msgpack_unpack(msgpack_pack($t)));
+
+$t = new MyClass();
+$t->preSerialize();
+var_dump($t);
+var_dump(msgpack_unpack(msgpack_pack($t)));
+?>
+OK
+--EXPECTF--
+object(MyClass)#%d (2) {
+  ["first_field":"MyClass":private]=>
+  string(11) "first_field"
+  ["second_field":"MyClass":private]=>
+  string(12) "second_field"
+}
+object(MyClass)#%d (2) {
+  ["first_field":"MyClass":private]=>
+  string(11) "first_field"
+  ["second_field":"MyClass":private]=>
+  string(12) "second_field"
+}
+object(MyClass)#%d (1) {
+  ["second_field":"MyClass":private]=>
+  string(12) "second_field"
+}
+object(MyClass)#%d (2) {
+  ["first_field":"MyClass":private]=>
+  NULL
+  ["second_field":"MyClass":private]=>
+  string(12) "second_field"
+}
+OK