diff options
| author | Anatol Belski <ab@php.net> | 2014-09-16 22:47:30 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-09-17 00:56:38 +0200 |
| commit | f2e728616ce184194b8310bbbae76a999950447f (patch) | |
| tree | 5531ce1c42e4e0620f222560de062afea02d3c4a | |
| parent | 551ee4165b62ff6dbd32ce0dcc213d66fc8ae083 (diff) | |
| download | php-git-f2e728616ce184194b8310bbbae76a999950447f.tar.gz | |
fix signed/unsigned mismatch warnings
| -rw-r--r-- | ext/standard/string.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index 7b18acf83c..a2ec4798fe 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -1813,7 +1813,7 @@ PHP_FUNCTION(strpos) ZEND_PARSE_PARAMETERS_END(); #endif - if (offset < 0 || offset > haystack->len) { + if (offset < 0 || (size_t)offset > haystack->len) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not contained in string"); RETURN_FALSE; } @@ -1863,7 +1863,7 @@ PHP_FUNCTION(stripos) return; } - if (offset < 0 || offset > haystack->len) { + if (offset < 0 || (size_t)offset > haystack->len) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not contained in string"); RETURN_FALSE; } @@ -1951,20 +1951,20 @@ PHP_FUNCTION(strrpos) } if (offset >= 0) { - if (offset > haystack->len) { + if ((size_t)offset > haystack->len) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset is greater than the length of haystack string"); RETURN_FALSE; } - p = haystack->val + offset; + p = haystack->val + (size_t)offset; e = haystack->val + haystack->len - needle_len; } else { - if (offset < -INT_MAX || -offset > haystack->len) { + if (offset < -INT_MAX || (size_t)(-offset) > haystack->len) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset is greater than the length of haystack string"); RETURN_FALSE; } p = haystack->val; - if (needle_len > -offset) { + if (needle_len > (size_t)(-offset)) { e = haystack->val + haystack->len - needle_len; } else { e = haystack->val + haystack->len + offset; |