Merge branch 'PHP-7.2' into PHP-7.3

smalyshev · smalyshev · commit dd3c664f8f72 · 2020-01-22T22:41:56.000-08:00
* PHP-7.2:
  More checks for php_strip_tags_ex
diff --git a/ext/standard/string.c b/ext/standard/string.c
@@ -5257,7 +5257,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
`@@ -5257,7 +5257,7 @@ PHPAPI size_t php_strip_tags_ex(char rbuf, size_t len, uint8_t stateptr, const`
`5257`	`5257`	`break;`
`5258`	`5258`	`}`
`5259`	`5259`
`5260`		`- if (!br && lc != '\"' && *(p-1) == '?') {`
	`5260`	`+ if (!br && p >= buf + 1 && lc != '\"' && *(p-1) == '?') {`
`5261`	`5261`	`in_q = state = 0;`
`5262`	`5262`	`tp = tbuf;`
`5263`	`5263`	`p++;`