Merge branch 'PHP-7.3' into PHP-7.4

cmb69 · cmb69 · commit f12dc90e5e96 · 2019-08-02T17:04:36.000+02:00
* PHP-7.3:
  Fix #78346: strip_tags no longer handling nested php tags
diff --git a/NEWS b/NEWS
@@ -40,6 +40,7 @@ PHP                                                                        NEWS
 - Standard:
   . Fixed bug #78326 (improper memory deallocation on stream_get_contents()
     with fixed length buffer). (Albert Casademont)
+  . Fixed bug #78346 (strip_tags no longer handling nested php tags). (cmb)
 
 25 Jul 2019, PHP 7.4.0beta1
 
diff --git a/ext/standard/string.c b/ext/standard/string.c
@@ -5385,8 +5385,7 @@ PHPAPI size_t php_strip_tags_ex(char *rbuf, size_t len, uint8_t *stateptr, const
 				} else if (lc != '\\') {
 					lc = c;
 				}
-			} else {
-				if (p != buf && *(p-1) != '\\' && (!in_q || *p == in_q)) {
+				if (p != buf && (!in_q || *p == in_q)) {
 					if (in_q) {
 						in_q = 0;
 					} else {
diff --git a/ext/standard/tests/strings/bug78346.phpt b/ext/standard/tests/strings/bug78346.phpt
@@ -0,0 +1,9 @@
+--TEST--
+Bug #78346 (strip_tags no longer handling nested php tags)
+--FILE--
+<?php
+$str = '<?= \'<?= 1 ?>\' ?>2';
+var_dump(strip_tags($str));
+?>
+--EXPECT--
+string(1) "2"
