]> granicus.if.org Git - php/commitdiff
fix some signed/unsigned mismatch
authorAnatol Belski <ab@php.net>
Mon, 13 Oct 2014 07:12:15 +0000 (09:12 +0200)
committerAnatol Belski <ab@php.net>
Mon, 13 Oct 2014 16:43:09 +0000 (18:43 +0200)
Zend/zend_generators.c
Zend/zend_indent.c

index c0d087fd996385bec6b6fedc5f9284afc524c6bd..b38657f7b778c74f01509f36ef4d5ed7a579c54b 100644 (file)
@@ -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) {
index 5ebc4527e2a202afdd2f279f0ebb1ca2595e0ca3..59c8fa6f92b1a18f4280957c846da2f383d56c4f 100644 (file)
@@ -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);