Merge branch 'PHP-7.4'

smalyshev · smalyshev · commit a698e36aa851 · 2020-01-22T23:06:35.000-08:00
* PHP-7.4:
  More checks for php_strip_tags_ex
diff --git a/ext/standard/string.c b/ext/standard/string.c
@@ -5099,7 +5099,7 @@ PHPAPI size_t php_strip_tags_ex(char *rbuf, size_t len, uint8_t *stateptr, const
 				break;
 			}
 
-			if (!br && lc != '\"' && *(p-1) == '?') {
+			if (!br && p >= buf + 1 && lc != '\"' && *(p-1) == '?') {
 				in_q = state = 0;
 				tp = tbuf;
 				p++;

Original file line number	Diff line number	Diff line change
`@@ -5099,7 +5099,7 @@ PHPAPI size_t php_strip_tags_ex(char rbuf, size_t len, uint8_t stateptr, const`
`5099`	`5099`	`break;`
`5100`	`5100`	`}`
`5101`	`5101`
`5102`		`- if (!br && lc != '\"' && *(p-1) == '?') {`
	`5102`	`+ if (!br && p >= buf + 1 && lc != '\"' && *(p-1) == '?') {`
`5103`	`5103`	`in_q = state = 0;`
`5104`	`5104`	`tp = tbuf;`
`5105`	`5105`	`p++;`