php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-29 11:42:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed for PHP7

Browse Source
This commit is contained in:
Xinchen Hui
2016-03-17 20:20:01 +08:00
parent 820b0aa2ab
commit 041a01fd6c
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@@ -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)

5
ext/opcache/Optimizer/block_pass.c
View File

@@ -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: