com php-src: Fixed for PHP7: NEWS ext/opcache/Optimizer/block _pass.c
| From: | Xinchen Hui | Date: | Thu, 17 Mar 2016 12:20:01 +0000 |
| Subject: | com php-src: Fixed for PHP7: NEWS ext/opcache/Optimizer/block _pass.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-91397@lists.php.net to get a copy of this message | ||
Commit: 041a01fd6cccb44bc38433aeffd958ce93b5a138
Author: Xinchen Hui <laruence@gmail.com> Thu, 17 Mar 2016 20:20:01 +0800
Parents: 820b0aa2ab029b7c792fce3a2155197375c41a5d
Branches: PHP-7.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=041a01fd6cccb44bc38433aeffd958ce93b5a138
Log:
Fixed for PHP7
Changed paths:
M NEWS
M ext/opcache/Optimizer/block_pass.c
Diff:
diff --git a/NEWS b/NEWS
index 4833396..419fbc4 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,10 @@ PHP NEWS
- Core:
. Fixed bug #71841 (EG(error_zval) is not handled well). (Laruence)
+- Opcache:
+ . Fixed bug #71843 (null ptr deref ZEND_RETURN_SPEC_CONST_HANDLER).
+ (Laruence)
+
- Standard:
. Fixed bug #71840 (Unserialize accepts wrongly data). (Ryat, Laruence)
diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c
index 1e85b0b..830addc 100644
--- a/ext/opcache/Optimizer/block_pass.c
+++ b/ext/opcache/Optimizer/block_pass.c
@@ -1894,8 +1894,11 @@ static void zend_t_usage(zend_code_block *block, zend_op_array *op_array,
zend_b
case ZEND_BOOL_NOT:
if (ZEND_OP1_TYPE(opline) == IS_CONST) {
literal_dtor(&ZEND_OP1_LITERAL(opline));
+ } else if (ZEND_OP1_TYPE(opline) == IS_TMP_VAR) {
+ opline->opcode = ZEND_FREE;
+ } else {
+ MAKE_NOP(opline);
}
- MAKE_NOP(opline);
break;
case ZEND_JMPZ_EX:
case ZEND_JMPNZ_EX: