diff options
| author | Anatol Belski <ab@php.net> | 2015-06-29 10:27:13 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-06-29 10:27:42 +0200 |
| commit | 5060060317b0fd8c8d806c81e673b37ffb830159 (patch) | |
| tree | 374406a5a47c6b638fcc167acd4eb9153b286763 | |
| parent | 8271890d8dd600a8b91fe41b2996ffdd878e2f6e (diff) | |
| download | php-git-5060060317b0fd8c8d806c81e673b37ffb830159.tar.gz | |
fix negative zend_long to size_t cast
| -rw-r--r-- | ext/standard/string.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index 6c5e58e2bb..101e88b6b3 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -2484,9 +2484,10 @@ PHP_FUNCTION(substr_replace) * of the string */ if (f < 0) { - f = Z_STRLEN_P(str) + f; - if (f < 0) { + if (f < 0 && -f > Z_STRLEN_P(str)) { f = 0; + } else { + f = Z_STRLEN_P(str) + f; } } else if (f > Z_STRLEN_P(str)) { f = Z_STRLEN_P(str); |