Better fix

Author: laruence

msgpack_pack.c

@@ -42,7 +42,7 @@ static inline int msgpack_check_ht_is_map(zval *array) /* {{{ */ {
 }
 /* }}} */
 
-static inline int msgpack_var_add(HashTable *var_hash, zval *var, zval **var_old) /* {{{ */ {
+static inline int msgpack_var_add(HashTable *var_hash, zval *var, zend_long *var_old) /* {{{ */ {
 	uint32_t len;
 	char id[32], *p;
 	zval *var_noref, *var_exists, zv;
@@ -68,14 +68,11 @@ static inline int msgpack_var_add(HashTable *var_hash, zval *var, zval **var_old
 	}
 
 	if (var_old && (var_exists = zend_hash_str_find(var_hash, p, len)) != NULL) {
+		*var_old = Z_LVAL_P(var_exists);
 		if (!Z_ISREF_P(var)) {
-			size_t offset = (char *)var_exists - (char*)var_hash->arData;
 			ZVAL_LONG(&zv, -1);
 			zend_hash_next_index_insert(var_hash, &zv);
-			/* table maybe resized */
-			var_exists = (zval *)((char *)var_hash->arData + offset);
 		}
-		*var_old = var_exists;
 		return 0;
 	}
 
@@ -408,7 +405,7 @@ static inline void msgpack_serialize_object(smart_str *buf, zval *val, HashTable
 
 void msgpack_serialize_zval(smart_str *buf, zval *val, HashTable *var_hash) /* {{{ */ {
 	zval *val_noref;
-	zval *var_already;
+	zend_long var_already;
 
 	if (Z_TYPE_P(val) == IS_INDIRECT) {
 		val = Z_INDIRECT_P(val);
@@ -423,7 +420,7 @@ void msgpack_serialize_zval(smart_str *buf, zval *val, HashTable *var_hash) /* {
 				msgpack_pack_long(buf, MSGPACK_SERIALIZE_TYPE_RECURSIVE);
 
 				msgpack_pack_long(buf, 0);
-				msgpack_pack_long(buf, Z_LVAL_P(var_already));
+				msgpack_pack_long(buf, var_already);
 
 				return;
 			} else if (Z_TYPE_P(Z_REFVAL_P(val)) == IS_OBJECT) {
@@ -433,7 +430,7 @@ void msgpack_serialize_zval(smart_str *buf, zval *val, HashTable *var_hash) /* {
 				msgpack_pack_long(buf, MSGPACK_SERIALIZE_TYPE_OBJECT_REFERENCE);
 
 				msgpack_pack_long(buf, 0);
-				msgpack_pack_long(buf, Z_LVAL_P(var_already));
+				msgpack_pack_long(buf, var_already);
 
 				return;
 			}
@@ -444,7 +441,7 @@ void msgpack_serialize_zval(smart_str *buf, zval *val, HashTable *var_hash) /* {
 			msgpack_pack_long(buf, MSGPACK_SERIALIZE_TYPE_OBJECT);
 
 			msgpack_pack_long(buf, 0);
-			msgpack_pack_long(buf, Z_LVAL_P(var_already));
+			msgpack_pack_long(buf, var_already);
 
 			return;
 		}