com php-src: fix signed/unsigned mismatch: Zend/zend_execute .c
| From: | Anatol Belski | Date: | Mon, 15 Sep 2014 10:58:45 +0000 |
| Subject: | com php-src: fix signed/unsigned mismatch: Zend/zend_execute .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81637@lists.php.net to get a copy of this message | ||
Commit: 836fd73cce8d0550baf5477bfb0ea0edbfae455a
Author: Anatol Belski <ab@php.net> Mon, 15 Sep 2014 12:12:18 +0200
Parents: c8ed0d81e755c700f86cddb74f62eda27bc6e2de
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=836fd73cce8d0550baf5477bfb0ea0edbfae455a
Log:
fix signed/unsigned mismatch
Changed paths:
M Zend/zend_execute.c
Diff:
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 27636fd..5e774e2 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -771,7 +771,7 @@ static void zend_assign_to_string_offset(zval *str, zend_long offset, zval *valu
}
old_str = Z_STR_P(str);
- if (offset >= Z_STRLEN_P(str)) {
+ if (offset >= (zend_long)Z_STRLEN_P(str)) {
zend_long old_len = Z_STRLEN_P(str);
Z_STR_P(str) = zend_string_realloc(Z_STR_P(str), offset + 1, 0);
Z_TYPE_INFO_P(str) = IS_STRING_EX;
@@ -1226,7 +1226,7 @@ static zend_always_inline void zend_fetch_dimension_address_read(zval *result,
z
offset = Z_LVAL_P(dim);
}
- if (UNEXPECTED(offset < 0) || UNEXPECTED(Z_STRLEN_P(container) <= offset)) {
+ if (UNEXPECTED(offset < 0) || UNEXPECTED((zend_long)Z_STRLEN_P(container) <= offset)) {
if (type != BP_VAR_IS) {
zend_error(E_NOTICE, "Uninitialized string offset: %pd", offset);
}
@@ -1654,7 +1654,7 @@ ZEND_API zend_execute_data
*zend_create_generator_execute_data(zend_execute_data
if (num_args > 0) {
zval *arg_src = ZEND_CALL_ARG(call, 1);
zval *arg_dst = ZEND_CALL_ARG(execute_data, 1);
- int i;
+ uint32_t i;
for (i = 0; i < num_args; i++) {
ZVAL_COPY_VALUE(arg_dst + i, arg_src + i);