- Fixed bug #47102 (strripos issues unexpected warning with UNICODE haystack) (Notice...

diff --git a/ext/standard/string.c b/ext/standard/string.c
index c3f522ae9ca892003c141283939963bdfcdb7470..d85e8ada23a37e2b8e9db1d327dec4b3b5954d42 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -2913,7 +2913,7 @@ PHP_FUNCTION(strripos)
        if (haystack_type == IS_UNICODE) {
                if (offset >= 0) {
                        U16_FWD_N(haystack.u, cu_offset, haystack_len, offset);
-                       if (cu_offset > haystack_len - needle_len) {
+                       if (cu_offset > haystack_len) {
                                php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Offset is greater than the length of haystack string");
                                RETURN_FALSE;
                        }