diff options
| author | Xinchen Hui <laruence@php.net> | 2014-07-19 13:12:56 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-07-19 13:12:56 +0800 |
| commit | a3e8a1091879dbea294f0398941acaa6abdb0af5 (patch) | |
| tree | d5bad3c6109d12fdd394d1c9c45840dead66ce15 | |
| parent | 5ed63b3bfc40ae7b6767f3a871a23ad8e23a0845 (diff) | |
| parent | cd95347cbc76e7c70207f3cab5a31c5fae03e4e3 (diff) | |
| download | php-git-a3e8a1091879dbea294f0398941acaa6abdb0af5.tar.gz | |
Merge branch 'PHP-5.6'
| -rw-r--r-- | Zend/zend_opcode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c index 0201d4165f..a07544ff9a 100644 --- a/Zend/zend_opcode.c +++ b/Zend/zend_opcode.c @@ -625,10 +625,10 @@ static void zend_resolve_fast_call(zend_op_array *op_array, zend_uint op_num TSR static void zend_resolve_finally_calls(zend_op_array *op_array TSRMLS_DC) { - zend_uint i; + zend_uint i, j; zend_op *opline; - for (i = 0; i < op_array->last; i++) { + for (i = 0, j = op_array->last; i < j; i++) { opline = op_array->opcodes + i; switch (opline->opcode) { case ZEND_RETURN: |