summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2020-01-24 13:04:26 +0100
committerChristoph M. Becker <cmbecker69@gmx.de>2020-01-24 13:04:26 +0100
commit5d6564101192f8560d175cdec96c319d3c878b82 (patch)
tree132aa0863aef39248e383fccf3c75ae9c488fc48
parent1d0247db7d86172eefdc1622d0fc1cbc3b956d52 (diff)
parent1b7343b93c5f6956fc0c8623045639b037643e0e (diff)
downloadphp-git-5d6564101192f8560d175cdec96c319d3c878b82.tar.gz
Merge branch 'PHP-7.4'
* PHP-7.4: Yet another check for php_strip_tags_ex()
-rw-r--r--ext/standard/string.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 9fda71eba4..ffa05a967b 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -5108,7 +5108,7 @@ state_2:
break;
case '"':
case '\'':
- if (*(p-1) != '\\') {
+ if (p >= buf + 1 && *(p-1) != '\\') {
if (lc == c) {
lc = '\0';
} else if (lc != '\\') {