com php-src: Fixed segfault introduced in 447e57a1e12cdcc6791302d5097119fb2165475a: ext/opcache/Optimizer /zend_inference.c
| From: | Xinchen Hui | Date: | Thu, 18 Aug 2016 07:37:39 +0000 |
| Subject: | com php-src: Fixed segfault introduced in 447e57a1e12cdcc6791302d5097119fb2165475a: ext/opcache/Optimizer /zend_inference.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93933@lists.php.net to get a copy of this message | ||
Commit: 66a527b8c1942cae140c5dab5f3eff2e33ca9740
Author: Xinchen Hui <laruence@gmail.com> Thu, 18 Aug 2016 15:37:39 +0800
Parents: a3740dadecec9d47cde6055996e2ca13dd10c4f6
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=66a527b8c1942cae140c5dab5f3eff2e33ca9740
Log:
Fixed segfault introduced in 447e57a1e12cdcc6791302d5097119fb2165475a
Changed paths:
M ext/opcache/Optimizer/zend_inference.c
Diff:
diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c
index e3bf922..174528f 100644
--- a/ext/opcache/Optimizer/zend_inference.c
+++ b/ext/opcache/Optimizer/zend_inference.c
@@ -3695,14 +3695,14 @@ static zend_bool can_convert_to_double(
static int zend_type_narrowing(const zend_op_array *op_array, const zend_script *script, zend_ssa
*ssa)
{
uint32_t bitset_len = zend_bitset_len(ssa->vars_count);
- zend_bitset visited = 0;
- zend_bitset worklist = visited + bitset_len;
+ zend_bitset visited, worklist;
int i, v;
zend_op *opline;
zend_bool narrowed = 0;
ALLOCA_FLAG(use_heap)
visited = ZEND_BITSET_ALLOCA(2 * bitset_len, use_heap);
+ worklist = visited + bitset_len;
zend_bitset_clear(worklist, bitset_len);