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

Merge branch 'master' of git.php.net:php-src

Browse Source
This commit is contained in:
Xinchen Hui
2015-06-18 22:30:01 +08:00
parent 20f3416682 fae6bedea5
commit d54e6f015b
3 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NEWS
+1
View File
@@ -3,6 +3,7 @@ PHP NEWS
25 Jun 2015, PHP 7.0.0 Alpha 2
- Core:
. Fixed bug #69872 (uninitialised value in strtr with array). (Laruence)
. Fixed bug #69868 (Invalid read of size 1 in zend_compile_short_circuiting).
(Laruence)
. Fixed bug #69823 (PHP 7.0.0alpha1 segmentation fault when exactly 33
Zend/tests/bug69871.phpt
+15
View File
@@ -0,0 +1,15 @@
--TEST--
Bug #69871 (Short-circuiting failure with smart_branch)
--FILE--
<?php
$a = true;
if (isset($a) && 0) {
var_dump(true);
} else {
var_dump(false);
}
?>
--EXPECT--
bool(false)
Zend/zend_execute.c
+14 -2
View File
@@ -2428,9 +2428,21 @@ static zend_always_inline zend_generator *zend_get_running_generator(zend_execut
# define ZEND_VM_SMART_BRANCH(_result, _check) do { \
int __result; \
if (EXPECTED((opline+1)->opcode == ZEND_JMPZ)) { \
__result = (_result); \
if (UNEXPECTED((opline+1)->op1_type == IS_CONST)) { \
zend_uchar __type = Z_TYPE_P(EX_CONSTANT((opline+1)->op1)); \
ZEND_ASSERT(__type == IS_TRUE || __type == IS_FALSE); /* assume boolean */ \
__result = __type == IS_TRUE; \
} else { \
__result = (_result); \
} \
} else if (EXPECTED((opline+1)->opcode == ZEND_JMPNZ)) { \
__result = !(_result); \
if (UNEXPECTED((opline+1)->op1_type == IS_CONST)) { \
zend_uchar __type = Z_TYPE_P(EX_CONSTANT((opline+1)->op1)); \
ZEND_ASSERT(__type == IS_TRUE || __type == IS_FALSE); /* assume boolean */ \
__result = __type != IS_TRUE; \
} else { \
__result = !(_result); \
} \
} else { \
break; \
} \