php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-05 07:02:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix signed/unsigned mismatch warnings

Browse Source
This commit is contained in:
Anatol Belski
2014-09-16 22:47:30 +02:00
parent 551ee4165b
commit f2e728616c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ext/standard/string.c
View File

@@ -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;