archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Avoid in-place modification of referenced data

Browse source
This commit is contained in:
Dmitry Stogov 2017-07-07 12:51:41 +03:00
parent 58f7c17978
commit e69d4f6140
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/opcache/Optimizer/zend_optimizer.c
View file

@ -332,6 +332,8 @@ int zend_optimizer_update_op2_const(zend_op_array *op_array,
zend_op *opline, zend_op *opline,
zval *val) zval *val)
{ {
zval tmp;
switch (opline->opcode) { switch (opline->opcode) {
case ZEND_ASSIGN_REF: case ZEND_ASSIGN_REF:
case ZEND_FAST_CALL: case ZEND_FAST_CALL:
@ -358,7 +360,13 @@ int zend_optimizer_update_op2_const(zend_op_array *op_array,
break; break;
case ZEND_INIT_FCALL: case ZEND_INIT_FCALL:
REQUIRES_STRING(val); REQUIRES_STRING(val);
if (Z_REFCOUNT_P(val) == 1) {
zend_str_tolower(Z_STRVAL_P(val), Z_STRLEN_P(val)); zend_str_tolower(Z_STRVAL_P(val), Z_STRLEN_P(val));
} else {
ZVAL_STR(&tmp, zend_string_tolower(Z_STR_P(val)));
zval_ptr_dtor_nogc(val);
val = &tmp;
}
opline->op2.constant = zend_optimizer_add_literal(op_array, val); opline->op2.constant = zend_optimizer_add_literal(op_array, val);
alloc_cache_slots_op2(op_array, opline, 1); alloc_cache_slots_op2(op_array, opline, 1);
break; break;