1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
|
--- src/tarantool_msgpack.c.orig 2018-04-18 13:33:56 UTC
+++ src/tarantool_msgpack.c
@@ -123,15 +123,30 @@ void php_mp_pack_array_recursively(smart
for (; key_index < n; ++key_index) {
data = zend_hash_index_find(ht, key_index);
if (!data || data == val || (Z_TYPE_P(data) == IS_ARRAY &&
+#if PHP_VERSION_ID >= 70300
+ !(GC_FLAGS(Z_ARRVAL_P(data)) & GC_IMMUTABLE) &&
+ GC_IS_RECURSIVE(Z_ARRVAL_P(data)))) {
+#else
ZEND_HASH_APPLY_PROTECTION(Z_ARRVAL_P(data)) &&
Z_ARRVAL_P(data)->u.v.nApplyCount > 1)) {
+#endif
php_mp_pack_nil(str);
} else {
+#if PHP_VERSION_ID >= 70300
+ if (Z_TYPE_P(data) == IS_ARRAY && !(GC_FLAGS(Z_ARRVAL_P(data)) & GC_IMMUTABLE))
+ GC_PROTECT_RECURSION(Z_ARRVAL_P(data));
+#else
if (Z_TYPE_P(data) == IS_ARRAY && ZEND_HASH_APPLY_PROTECTION(Z_ARRVAL_P(data)))
Z_ARRVAL_P(data)->u.v.nApplyCount++;
+#endif
php_mp_pack(str, data);
+#if PHP_VERSION_ID >= 70300
+ if (Z_TYPE_P(data) == IS_ARRAY && !(GC_FLAGS(Z_ARRVAL_P(data)) & GC_IMMUTABLE))
+ GC_UNPROTECT_RECURSION(Z_ARRVAL_P(data));
+#else
if (Z_TYPE_P(data) == IS_ARRAY && ZEND_HASH_APPLY_PROTECTION(Z_ARRVAL_P(data)))
Z_ARRVAL_P(data)->u.v.nApplyCount--;
+#endif
}
}
}
@@ -166,15 +181,30 @@ void php_mp_pack_hash_recursively(smart_
}
data = zend_hash_get_current_data_ex(ht, &pos);
if (!data || data == val || (Z_TYPE_P(data) == IS_ARRAY &&
+#if PHP_VERSION_ID >= 70300
+ !(GC_FLAGS(Z_ARRVAL_P(data)) & GC_IMMUTABLE) &&
+ GC_IS_RECURSIVE(Z_ARRVAL_P(data)))) {
+#else
ZEND_HASH_APPLY_PROTECTION(Z_ARRVAL_P(data)) &&
Z_ARRVAL_P(data)->u.v.nApplyCount > 1)) {
+#endif
php_mp_pack_nil(str);
} else {
+#if PHP_VERSION_ID >= 70300
+ if (Z_TYPE_P(data) == IS_ARRAY && !(GC_FLAGS(Z_ARRVAL_P(data)) & GC_IMMUTABLE))
+ GC_PROTECT_RECURSION(Z_ARRVAL_P(data));
+#else
if (Z_TYPE_P(data) == IS_ARRAY && ZEND_HASH_APPLY_PROTECTION(Z_ARRVAL_P(data)))
Z_ARRVAL_P(data)->u.v.nApplyCount++;
+#endif
php_mp_pack(str, data);
+#if PHP_VERSION_ID >= 70300
+ if (Z_TYPE_P(data) == IS_ARRAY && !(GC_FLAGS(Z_ARRVAL_P(data)) & GC_IMMUTABLE))
+ GC_UNPROTECT_RECURSION(Z_ARRVAL_P(data));
+#else
if (Z_TYPE_P(data) == IS_ARRAY && ZEND_HASH_APPLY_PROTECTION(Z_ARRVAL_P(data)))
Z_ARRVAL_P(data)->u.v.nApplyCount--;
+#endif
}
}
}
@@ -408,14 +438,28 @@ size_t php_mp_sizeof_array_recursively(z
for (; key_index < n; ++key_index) {
data = zend_hash_index_find(ht, key_index);
if (!data || data == val ||
+#if PHP_VERSION_ID >= 70300
+ (Z_TYPE_P(data) == IS_ARRAY && !(GC_FLAGS(Z_ARRVAL_P(data)) & GC_IMMUTABLE) && GC_IS_RECURSIVE(Z_ARRVAL_P(data)))) {
+#else
(Z_TYPE_P(data) == IS_ARRAY && ZEND_HASH_APPLY_PROTECTION(Z_ARRVAL_P(data)) && Z_ARRVAL_P(data)->u.v.nApplyCount > 1)) {
+#endif
needed += php_mp_sizeof_nil();
} else {
+#if PHP_VERSION_ID >= 70300
+ if (Z_TYPE_P(data) == IS_ARRAY && !(GC_FLAGS(Z_ARRVAL_P(data)) & GC_IMMUTABLE))
+ GC_PROTECT_RECURSION(Z_ARRVAL_P(data));
+#else
if (Z_TYPE_P(data) == IS_ARRAY && ZEND_HASH_APPLY_PROTECTION(Z_ARRVAL_P(data)))
Z_ARRVAL_P(data)->u.v.nApplyCount++;
+#endif
needed += php_mp_sizeof(data);
+#if PHP_VERSION_ID >= 70300
+ if (Z_TYPE_P(data) == IS_ARRAY && !(GC_FLAGS(Z_ARRVAL_P(data)) & GC_IMMUTABLE))
+ GC_UNPROTECT_RECURSION(Z_ARRVAL_P(data));
+#else
if (Z_TYPE_P(data) == IS_ARRAY && ZEND_HASH_APPLY_PROTECTION(Z_ARRVAL_P(data)))
Z_ARRVAL_P(data)->u.v.nApplyCount--;
+#endif
}
}
return needed;
@@ -452,14 +496,28 @@ size_t php_mp_sizeof_hash_recursively(zv
}
data = zend_hash_get_current_data_ex(ht, &pos);
if (!data || data == val ||
+#if PHP_VERSION_ID >= 70300
+ (Z_TYPE_P(data) == IS_ARRAY && !(GC_FLAGS(Z_ARRVAL_P(data)) & GC_IMMUTABLE) && GC_IS_RECURSIVE(Z_ARRVAL_P(data)))) {
+#else
(Z_TYPE_P(data) == IS_ARRAY && ZEND_HASH_APPLY_PROTECTION(Z_ARRVAL_P(data)) && Z_ARRVAL_P(data)->u.v.nApplyCount > 1)) {
+#endif
needed += php_mp_sizeof_nil();
} else {
+#if PHP_VERSION_ID >= 70300
+ if (Z_TYPE_P(data) == IS_ARRAY && !(GC_FLAGS(Z_ARRVAL_P(data)) & GC_IMMUTABLE))
+ GC_PROTECT_RECURSION(Z_ARRVAL_P(data));
+#else
if (Z_TYPE_P(data) == IS_ARRAY && ZEND_HASH_APPLY_PROTECTION(Z_ARRVAL_P(data)))
Z_ARRVAL_P(data)->u.v.nApplyCount++;
+#endif
needed += php_mp_sizeof(data);
+#if PHP_VERSION_ID >= 70300
+ if (Z_TYPE_P(data) == IS_ARRAY && !(GC_FLAGS(Z_ARRVAL_P(data)) & GC_IMMUTABLE))
+ GC_UNPROTECT_RECURSION(Z_ARRVAL_P(data));
+#else
if (Z_TYPE_P(data) == IS_ARRAY && ZEND_HASH_APPLY_PROTECTION(Z_ARRVAL_P(data)))
Z_ARRVAL_P(data)->u.v.nApplyCount--;
+#endif
}
}
return needed;
|
