diff options
| -rw-r--r-- | ext/standard/string.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index a5dff3ed8f..540908db96 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -1360,6 +1360,7 @@ PHP_FUNCTION(strstr) zval **haystack, **needle; char *found = NULL; char needle_char[2]; + long found_offset; if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &haystack, &needle) == FAILURE) { @@ -1387,7 +1388,8 @@ PHP_FUNCTION(strstr) } if (found) { - RETURN_STRING(found, 1); + found_offset = found - Z_STRVAL_PP(haystack); + RETURN_STRINGL(found, Z_STRLEN_PP(haystack) - found_offset, 1); } else { RETURN_FALSE; } |