summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2020-01-22 22:41:56 -0800
committerStanislav Malyshev <stas@php.net>2020-01-22 22:41:56 -0800
commitdd3c664f8f72263ec690f20c1eeca4c52f473dba (patch)
tree21deb819276ca2bb111a9b2c766097e7d3545b00
parentf1bf4bf6eb8bb6e65a0cc28d18d79300f5c14d5f (diff)
parent2dc170e25d86a725fefd4c08f2bd8378820b28f5 (diff)
downloadphp-git-dd3c664f8f72263ec690f20c1eeca4c52f473dba.tar.gz
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2: 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 0fe8796a03..f443519a72 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -5257,7 +5257,7 @@ state_2:
break;
}
- if (!br && lc != '\"' && *(p-1) == '?') {
+ if (!br && p >= buf + 1 && lc != '\"' && *(p-1) == '?') {
in_q = state = 0;
tp = tbuf;
p++;