Skip to content

Commit 736aac0

Browse files
try fix circleci
1 parent 1bf2dbd commit 736aac0

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

Zend/zend_execute.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2631,7 +2631,9 @@ static zend_never_inline uint8_t slow_index_convert(HashTable *ht, const zval *d
26312631
case IS_NULL:
26322632
/* The array may be destroyed while throwing the notice.
26332633
* Temporarily increase the refcount to detect this situation. */
2634-
GC_TRY_ADDREF(ht);
2634+
if (!(GC_FLAGS(ht) & IS_ARRAY_IMMUTABLE)) {
2635+
GC_ADDREF(ht);
2636+
}
26352637

26362638
zend_error(E_DEPRECATED, "Using null as an array offset is deprecated, use an empty string instead");
26372639

@@ -2716,7 +2718,9 @@ static zend_never_inline uint8_t slow_index_convert_w(HashTable *ht, const zval
27162718
case IS_NULL:
27172719
/* The array may be destroyed while throwing the notice.
27182720
* Temporarily increase the refcount to detect this situation. */
2719-
GC_TRY_ADDREF(ht);
2721+
if (!(GC_FLAGS(ht) & IS_ARRAY_IMMUTABLE)) {
2722+
GC_ADDREF(ht);
2723+
}
27202724

27212725
zend_error(E_DEPRECATED, "Using null as an array offset is deprecated, use an empty string instead");
27222726

@@ -3222,7 +3226,9 @@ static zend_never_inline zval* ZEND_FASTCALL zend_find_array_dim_slow(HashTable
32223226
null_undef_idx:
32233227
/* The array may be destroyed while throwing the notice.
32243228
* Temporarily increase the refcount to detect this situation. */
3225-
GC_TRY_ADDREF(ht);
3229+
if (!(GC_FLAGS(ht) & IS_ARRAY_IMMUTABLE)) {
3230+
GC_ADDREF(ht);
3231+
}
32263232

32273233
zend_error(E_DEPRECATED, "Using null as an array offset is deprecated, use an empty string instead");
32283234

0 commit comments

Comments
 (0)