diff options
| author | Anatol Belski <ab@php.net> | 2014-10-13 19:02:22 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-13 19:02:22 +0200 |
| commit | 766eb0103fe8f59c00ddadc5c5767093ee35b2e8 (patch) | |
| tree | f11b01c33784791330f5f524faed6dab9c04766b /Zend/zend_generators.c | |
| parent | 19c41e1f538e854fa8450715791c44f55e909588 (diff) | |
| parent | 65eb8ef8d040976e81b5f7b11e74013218cd1428 (diff) | |
| download | php-git-766eb0103fe8f59c00ddadc5c5767093ee35b2e8.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
fix several datatype mismatch warnings
fix signed/unsigned mismatch warning
more signed/unsigned mismatch fix
fix signed/unsigned mismatch warning
fix signed/unsigned mismatch
fix some signed/unsigned mismatch
missing include for strlen proto
More fixes for array/object casts with temporary variables
Fix array/object cast of refcounted tmp var
Deref right value for compound assign ops
Diffstat (limited to 'Zend/zend_generators.c')
| -rw-r--r-- | Zend/zend_generators.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c index c0d087fd99..b38657f7b7 100644 --- a/Zend/zend_generators.c +++ b/Zend/zend_generators.c @@ -52,9 +52,9 @@ static void zend_generator_cleanup_unfinished_execution(zend_generator *generato if (brk_cont->start < 0) { continue; - } else if (brk_cont->start > op_num) { + } else if ((uint32_t)brk_cont->start > op_num) { break; - } else if (brk_cont->brk > op_num) { + } else if (brk_cont->brk >= 0 && (uint32_t)brk_cont->brk > op_num) { zend_op *brk_opline = op_array->opcodes + brk_cont->brk; if (brk_opline->opcode == ZEND_FREE) { |