diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-05-04 14:50:31 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-05-04 14:51:18 +0200 |
| commit | 7c1316ec6a726adaf96b9101054b85bbd763c14f (patch) | |
| tree | 4fe9abc410df7fedf76b8f08913d0676c611b180 | |
| parent | d950969e596acc15c8155de6f2a20b6cf50cf45e (diff) | |
| download | php-git-7c1316ec6a726adaf96b9101054b85bbd763c14f.tar.gz | |
Fixed bug #79535
We did not allocate a cache slot for FETCH_CLASS. This is already
fixed on newer PHP versions.
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/opcache/Optimizer/zend_optimizer.c | 9 | ||||
| -rw-r--r-- | ext/opcache/tests/bug79535.phpt | 15 |
3 files changed, 24 insertions, 4 deletions
@@ -2,6 +2,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? ????, PHP 7.3.19 +- Opcache: + . Fixed bug #79535 (PHP crashes with specific opcache.optimization_level). + (Nikita) + - SimpleXML: . Fixed bug #79528 (Different object of the same xml between 7.4.5 and 7.4.4). (cmb) diff --git a/ext/opcache/Optimizer/zend_optimizer.c b/ext/opcache/Optimizer/zend_optimizer.c index c7d8b76c45..09e68cdbc4 100644 --- a/ext/opcache/Optimizer/zend_optimizer.c +++ b/ext/opcache/Optimizer/zend_optimizer.c @@ -391,19 +391,20 @@ int zend_optimizer_update_op2_const(zend_op_array *op_array, (opline + 1)->op2.var == opline->result.var) { return 0; } - case ZEND_ADD_INTERFACE: - case ZEND_ADD_TRAIT: + /* break missing intentionally */ + case ZEND_INSTANCEOF: REQUIRES_STRING(val); drop_leading_backslash(val); opline->op2.constant = zend_optimizer_add_literal(op_array, val); zend_optimizer_add_literal_string(op_array, zend_string_tolower(Z_STR_P(val))); + opline->extended_value = alloc_cache_slots(op_array, 1); break; - case ZEND_INSTANCEOF: + case ZEND_ADD_INTERFACE: + case ZEND_ADD_TRAIT: REQUIRES_STRING(val); drop_leading_backslash(val); opline->op2.constant = zend_optimizer_add_literal(op_array, val); zend_optimizer_add_literal_string(op_array, zend_string_tolower(Z_STR_P(val))); - opline->extended_value = alloc_cache_slots(op_array, 1); break; case ZEND_INIT_FCALL_BY_NAME: REQUIRES_STRING(val); diff --git a/ext/opcache/tests/bug79535.phpt b/ext/opcache/tests/bug79535.phpt new file mode 100644 index 0000000000..0a0b53fb11 --- /dev/null +++ b/ext/opcache/tests/bug79535.phpt @@ -0,0 +1,15 @@ +--TEST-- +Bug #79535: PHP crashes with specific opcache.optimization_level +--INI-- +opcache.optimization_level=0x000000a0 +--FILE-- +<?php +function create() { + $name = stdClass::class; + return new $name; +} +var_dump(create()); +?> +--EXPECT-- +object(stdClass)#1 (0) { +} |