summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2020-01-22 23:06:28 -0800
committerStanislav Malyshev <stas@php.net>2020-01-22 23:06:28 -0800
commit984d508825cc5ae8eaad2e74bafa573d6706f6ff (patch)
tree11f28bc7ec442c98b86e953083294da65b4880be
parent496e6a8f3a7e621e3c7382069bea8f4e4ad87b2d (diff)
parentdd3c664f8f72263ec690f20c1eeca4c52f473dba (diff)
downloadphp-git-984d508825cc5ae8eaad2e74bafa573d6706f6ff.tar.gz
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: More checks 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 934936ba94..fa5637c17b 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -5371,7 +5371,7 @@ state_2:
break;
}
- if (!br && lc != '\"' && *(p-1) == '?') {
+ if (!br && p >= buf + 1 && lc != '\"' && *(p-1) == '?') {
in_q = state = 0;
tp = tbuf;
p++;