summaryrefslogtreecommitdiff
path: root/Zend/zend_execute.c
diff options
context:
space:
mode:
authorRudi Theunissen <rudolf.theunissen@gmail.com>2018-06-28 18:56:30 -0400
committerNikita Popov <nikita.ppv@gmail.com>2018-07-02 16:41:59 +0200
commit30156d588c07e26d4e752ddb62344e96854d4773 (patch)
tree569af90625c7a0397f444cb871172fa77a153da9 /Zend/zend_execute.c
parent6d61814d0e2115b834b1e6cbc27c6b05299b3e7a (diff)
downloadphp-git-30156d588c07e26d4e752ddb62344e96854d4773.tar.gz
Fixed bug #63217
Don't automatically convert literal string keys to integers on array access, as we may be dealing with an ArrayAccess object, rather than a plain array.
Diffstat (limited to 'Zend/zend_execute.c')
-rw-r--r--Zend/zend_execute.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 8e916c23a4..90addced09 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -1731,10 +1731,8 @@ num_undef:
}
} else if (EXPECTED(Z_TYPE_P(dim) == IS_STRING)) {
offset_key = Z_STR_P(dim);
- if (dim_type != IS_CONST) {
- if (ZEND_HANDLE_NUMERIC(offset_key, hval)) {
- goto num_index;
- }
+ if (ZEND_HANDLE_NUMERIC(offset_key, hval)) {
+ goto num_index;
}
str_index:
retval = zend_hash_find_ex(ht, offset_key, dim_type == IS_CONST);