com php-src: fix some signed/unsigned mismatch: Zend/zend_gen erators.c Zend/zend_indent.c

From: Date: Mon, 13 Oct 2014 16:43:09 +0000
Subject: com php-src: fix some signed/unsigned mismatch: Zend/zend_gen erators.c Zend/zend_indent.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-82272@lists.php.net to get a copy of this message
Commit: 84477c7c3963b175c2c31fff63b5297587e92858 Author: Anatol Belski <ab@php.net> Mon, 13 Oct 2014 09:12:15 +0200 Parents: 784c235f40e62fb01749b44779f412fff7881d97 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=84477c7c3963b175c2c31fff63b5297587e92858 Log: fix some signed/unsigned mismatch Changed paths: M Zend/zend_generators.c M Zend/zend_indent.c Diff: diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c index c0d087f..b38657f 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) { diff --git a/Zend/zend_indent.c b/Zend/zend_indent.c index 5ebc452..59c8fa6 100644 --- a/Zend/zend_indent.c +++ b/Zend/zend_indent.c @@ -54,7 +54,7 @@ ZEND_API void zend_indent(TSRMLS_D) int in_string=0; int nest_level=0; int emit_whitespace[256]; - int i; + unsigned int i; memset(emit_whitespace, 0, sizeof(int)*256);

« previous php.cvs (#82272) next »