diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-04-08 11:41:53 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-04-08 11:41:53 +0200 |
| commit | c3ca4dd53e4c6765e50280d422456674a7034f08 (patch) | |
| tree | 166a8cb903d6cdc8751f8c88b3a1257db2230736 /ext/standard/string.c | |
| parent | 9e2937d0f259bf7f54179a4e3ac68b07570c269b (diff) | |
| parent | 08a306281622e7795de820ca38ec42274c6e0b44 (diff) | |
| download | php-git-c3ca4dd53e4c6765e50280d422456674a7034f08.tar.gz | |
Merge branch 'PHP-7.3' into 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 97725bf3f4..3b8f306be4 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -6213,7 +6213,7 @@ PHP_FUNCTION(substr_compare) offset = (offset < 0) ? 0 : offset; } - if ((size_t)offset >= ZSTR_LEN(s1)) { + if ((size_t)offset > ZSTR_LEN(s1)) { php_error_docref(NULL, E_WARNING, "The start position cannot exceed initial string length"); RETURN_FALSE; } |