Skip to content

Commit c41efe0

Browse files
committed
Pass access type again to string offset error function
1 parent 4e58749 commit c41efe0

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Zend/zend_execute.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1521,9 +1521,9 @@ static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_illegal_array_offset_
15211521
zend_illegal_container_offset(ZSTR_KNOWN(ZEND_STR_ARRAY), offset, BP_VAR_UNSET);
15221522
}
15231523

1524-
static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_illegal_string_offset_access(const zval *offset)
1524+
static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_illegal_string_offset(const zval *offset, int type)
15251525
{
1526-
zend_illegal_container_offset(ZSTR_KNOWN(ZEND_STR_STRING), offset, BP_VAR_RW);
1526+
zend_illegal_container_offset(ZSTR_KNOWN(ZEND_STR_STRING), offset, type);
15271527
}
15281528

15291529
static zend_never_inline void zend_assign_to_object_dim(zend_object *obj, zval *dim, zval *value OPLINE_DC EXECUTE_DATA_DC)
@@ -1651,7 +1651,7 @@ static zend_never_inline zend_long zend_check_string_offset(zval *dim, int type
16511651
}
16521652
return offset;
16531653
}
1654-
zend_illegal_string_offset_access(dim);
1654+
zend_illegal_string_offset(dim, type);
16551655
return 0;
16561656
}
16571657
case IS_UNDEF:
@@ -1667,7 +1667,7 @@ static zend_never_inline zend_long zend_check_string_offset(zval *dim, int type
16671667
dim = Z_REFVAL_P(dim);
16681668
goto try_again;
16691669
default:
1670-
zend_illegal_string_offset_access(dim);
1670+
zend_illegal_string_offset(dim, type);
16711671
return 0;
16721672
}
16731673

@@ -2762,7 +2762,7 @@ static zend_always_inline void zend_fetch_dimension_address_read(zval *result, z
27622762
ZVAL_NULL(result);
27632763
return;
27642764
}
2765-
zend_illegal_string_offset_access(dim);
2765+
zend_illegal_string_offset(dim, BP_VAR_R);
27662766
ZVAL_NULL(result);
27672767
return;
27682768
}
@@ -2801,7 +2801,7 @@ static zend_always_inline void zend_fetch_dimension_address_read(zval *result, z
28012801
dim = Z_REFVAL_P(dim);
28022802
goto try_string_offset;
28032803
default:
2804-
zend_illegal_string_offset_access(dim);
2804+
zend_illegal_string_offset(dim, BP_VAR_R);
28052805
ZVAL_NULL(result);
28062806
return;
28072807
}

0 commit comments

Comments
 (0)