Merge branch 'PHP-7.3' into PHP-7.4

smalyshev · smalyshev · commit 984d508825cc · 2020-01-22T23:06:28.000-08:00
* PHP-7.3:
  More checks for php_strip_tags_ex
diff --git a/ext/standard/string.c b/ext/standard/string.c
@@ -5371,7 +5371,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
`@@ -5371,7 +5371,7 @@ PHPAPI size_t php_strip_tags_ex(char rbuf, size_t len, uint8_t stateptr, const`
`5371`	`5371`	`break;`
`5372`	`5372`	`}`
`5373`	`5373`
`5374`		`- if (!br && lc != '\"' && *(p-1) == '?') {`
	`5374`	`+ if (!br && p >= buf + 1 && lc != '\"' && *(p-1) == '?') {`
`5375`	`5375`	`in_q = state = 0;`
`5376`	`5376`	`tp = tbuf;`
`5377`	`5377`	`p++;`