diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-20 16:24:31 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-20 16:24:31 +0200 |
| commit | 6aaab9adf7619c121c19701022aeb8d88f9c3bab (patch) | |
| tree | 531c292fdae6364f73f141759788a626888238d8 /ext/standard/string.c | |
| parent | 50978128f50eb5fa5920aea8a19a5855059a87c7 (diff) | |
| parent | 6165c23475d5020cda3794cb684693a7fab9918d (diff) | |
| download | php-git-6aaab9adf7619c121c19701022aeb8d88f9c3bab.tar.gz | |
Merge branch 'PHP-7.4'
Diffstat (limited to 'ext/standard/string.c')
| -rw-r--r-- | ext/standard/string.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index 5c56bb4f62..bf2891c690 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -2057,7 +2057,7 @@ PHP_FUNCTION(strripos) php_error_docref(NULL, E_WARNING, "Offset is greater than the length of haystack string"); RETURN_FALSE; } - e = ZSTR_VAL(haystack) + ZSTR_LEN(haystack) + (size_t)offset; + e = ZSTR_VAL(haystack) + (ZSTR_LEN(haystack) + (size_t)offset); } /* Borrow that ord_needle buffer to avoid repeatedly tolower()ing needle */ lowered = tolower(*ZSTR_VAL(needle)); |