fix #83

checking the count of an array with its internal next free element
index is insufficient to determine if the array has sequential keys

Author: m6w6

msgpack_pack.c

@@ -21,23 +21,16 @@
 #include "msgpack/pack_template.h"
 
 static inline int msgpack_check_ht_is_map(zval *array) /* {{{ */ {
-	uint32_t count;
-
-	ZEND_ASSERT(Z_TYPE_P(array) == IS_ARRAY);
-
-	count = zend_hash_num_elements(Z_ARRVAL_P(array));
-
-	if (count != (Z_ARRVAL_P(array))->nNextFreeElement) {
-		return 1;
-	} else {
-		zend_string *key;
+	Bucket *b;
+	zend_ulong i = 0;
 
-		ZEND_HASH_FOREACH_STR_KEY(Z_ARRVAL_P(array), key) {
-			if (key) {
-				return 1;
-			}
-		} ZEND_HASH_FOREACH_END();
+	ZEND_HASH_FOREACH_BUCKET(Z_ARRVAL_P(array), b)
+	{
+		if (b->key || b->h != i++) {
+			return 1;
+		}
 	}
+	ZEND_HASH_FOREACH_END();
 	return 0;
 }
 /* }}} */

tests/bug006.phpt

@@ -33,9 +33,9 @@ Array
 )
 Array
 (
-    [0] => dummy
     [1] => foo
     [2] => bar
+    [0] => dummy
 )
 string(3) "foo"
 string(3) "bar"

tests/issue083.phpt

@@ -0,0 +1,41 @@
+--TEST--
+Issue #83 (Arrays and negative index)
+--SKIPIF--
+<?php
+if (!extension_loaded("msgpack")) {
+	die("skip");
+}
+?>
+--FILE--
+<?php
+
+var_dump(msgpack_unpack(msgpack_pack([-1=>-1,1=>1])));
+
+$a = [
+	-1 => -1,
+	0,
+	1 => 1, 
+	2
+];
+// next free element == 3 and count() == 3, but it's still not an MP array
+unset($a[1]);
+var_dump(msgpack_unpack(msgpack_pack($a)));
+
+?>
+OK
+--EXPECT--
+array(2) {
+  [-1]=>
+  int(-1)
+  [1]=>
+  int(1)
+}
+array(3) {
+  [-1]=>
+  int(-1)
+  [0]=>
+  int(0)
+  [2]=>
+  int(2)
+}
+OK