From 5f6effed4323191d00bbdb48271a390d366e539d Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sun, 10 Jul 2016 15:13:21 +0200 Subject: [PATCH] Add opcodes to zend_wrong_string_offset() --- Zend/tests/string_offset_errors.phpt | 27 ++++++++++++++++++++++++++ Zend/zend_execute.c | 2 ++ ext/opcache/Optimizer/zend_inference.c | 1 + 3 files changed, 30 insertions(+) create mode 100644 Zend/tests/string_offset_errors.phpt diff --git a/Zend/tests/string_offset_errors.phpt b/Zend/tests/string_offset_errors.phpt new file mode 100644 index 0000000000..b709408c35 --- /dev/null +++ b/Zend/tests/string_offset_errors.phpt @@ -0,0 +1,27 @@ +--TEST-- +Some string offset errors +--FILE-- +getMessage(), "\n"; +} + +try { + $str = "foo"; + $str[0] =& $str[1]; +} catch (Error $e) { + echo $e->getMessage(), "\n"; +} + +?> +--EXPECT-- +Cannot return string offsets by reference +Cannot create references to/from string offsets diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 7c8621fe64..d1c73917ca 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1262,9 +1262,11 @@ static zend_never_inline ZEND_COLD void zend_wrong_string_offset(void) case ZEND_ASSIGN_REF: case ZEND_ADD_ARRAY_ELEMENT: case ZEND_INIT_ARRAY: + case ZEND_MAKE_REF: msg = "Cannot create references to/from string offsets"; break; case ZEND_RETURN_BY_REF: + case ZEND_VERIFY_RETURN_TYPE: msg = "Cannot return string offsets by reference"; break; case ZEND_UNSET_DIM: diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c index 4760076f05..c8dd1004d7 100644 --- a/ext/opcache/Optimizer/zend_inference.c +++ b/ext/opcache/Optimizer/zend_inference.c @@ -3229,6 +3229,7 @@ static void zend_update_type_info(const zend_op_array *op_array, case ZEND_ADD_ARRAY_ELEMENT: case ZEND_RETURN_BY_REF: case ZEND_VERIFY_RETURN_TYPE: + case ZEND_MAKE_REF: tmp |= MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF; break; case ZEND_PRE_INC: -- 2.40.0