summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/standard/string.c5
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);