Changeset 58040 for trunk/src/wp-includes/html-api/class-wp-html-tag-processor.php

Timestamp:

04/24/2024 07:43:02 AM (19 months ago)

Author:

dmsnell

Message:

HTML API: Fix detection of single-length funky comments.

Since [60428] the Tag Processor has been misidentifying single-character
funky comments. It has been asserting that the full token-length for a
funky comment must be at least three characters after the opening (e.g.
</1>), but it has been starting to look for the closing > after
those same three characters. This means that it has been skipping the
actual close of these funky comments and swallowing up the next syntax
until it finds a >, often consuming the next tag in the process.

This patch fixes the detector and restores finding the following token.

Developed in ​https://github.com/WordPress/wordpress-develop/pull/6412
Discussed in https://core.trac.wordpress.org/ticket/60170

Follow-up to [60428].
Fixes #60170.
Props dmsnell, gziolo, jonsurrell.

File:

• trunk/src/wp-includes/html-api/class-wp-html-tag-processor.php (modified) (4 diffs)

trunk/src/wp-includes/html-api/class-wp-html-tag-processor.php

@@ -1630 +1630 @@
              * https://html.spec.whatwg.org/multipage/parsing.html#markup-declaration-open-state
              */
-            if ( '!' === $html[ $at + 1 ] ) {
+            if ( ! $this->is_closing_tag && '!' === $html[ $at + 1 ] ) {
                 /*
                  * `<!--` transitions to a comment state – apply further comment rules.
@@ -1810 +1810 @@
              */
             if ( '>' === $html[ $at + 1 ] ) {
+                // `<>` is interpreted as plaintext.
+                if ( ! $this->is_closing_tag ) {
+                    ++$at;
+                    continue;
+                }
+
                 $this->parser_state         = self::STATE_PRESUMPTUOUS_TAG;
                 $this->token_length         = $at + 2 - $this->token_starts_at;
@@ -1820 +1826 @@
              * See https://html.spec.whatwg.org/multipage/parsing.html#tag-open-state
              */
-            if ( '?' === $html[ $at + 1 ] ) {
+            if ( ! $this->is_closing_tag && '?' === $html[ $at + 1 ] ) {
                 $closer_at = strpos( $html, '>', $at + 2 );
                 if ( false === $closer_at ) {
@@ -1892 +1898 @@
                 }
 
-                $closer_at = strpos( $html, '>', $at + 3 );
+                $closer_at = strpos( $html, '>', $at + 2 );
                 if ( false === $closer_at ) {
                     $this->parser_state = self::STATE_INCOMPLETE_INPUT;