com php-src: Revert "Fixed segfault in file cache serialize if live range is empty after": ext/opcache/Optimizer/zend_optimizer.c

Commit: ab3a820aa37062c7c307a706c06bce8606206942 Author: Xinchen Hui <laruence@gmail.com> Mon, 15 Feb 2016 12:09:13 +0800 Parents: 2661a474793f7a599dba5353874a3d381e4b820b Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ab3a820aa37062c7c307a706c06bce8606206942 Log: Revert "Fixed segfault in file cache serialize if live range is empty after" This reverts commit 2661a474793f7a599dba5353874a3d381e4b820b. Changed paths: M ext/opcache/Optimizer/zend_optimizer.c Diff: diff --git a/ext/opcache/Optimizer/zend_optimizer.c b/ext/opcache/Optimizer/zend_optimizer.c index f398a83..e2a12de 100644 --- a/ext/opcache/Optimizer/zend_optimizer.c +++ b/ext/opcache/Optimizer/zend_optimizer.c @@ -368,20 +368,16 @@ void zend_optimizer_remove_live_range(zend_op_array *op_array, uint32_t var) i++; } while (i < op_array->last_live_range); if (i != j) { - if ((op_array->last_live_range = j)) { - zend_op *opline = op_array->opcodes; - zend_op *end = opline + op_array->last; - - while (opline != end) { - if ((opline->opcode == ZEND_FREE || opline->opcode == ZEND_FE_FREE) && - opline->extended_value == ZEND_FREE_ON_RETURN) { - opline->op2.num = map[opline->op2.num]; - } - opline++; + zend_op *opline = op_array->opcodes; + zend_op *end = opline + op_array->last; + + op_array->last_live_range = j; + while (opline != end) { + if ((opline->opcode == ZEND_FREE || opline->opcode == ZEND_FE_FREE) && + opline->extended_value == ZEND_FREE_ON_RETURN) { + opline->op2.num = map[opline->op2.num]; } - } else { - efree(op_array->live_range); - op_array->live_range = NULL; + opline++; } } free_alloca(map, use_heap);