Changeset 63911

Timestamp:

09/24/2026 05:01:36 AM (4 days ago)

Author:

jonsurrell

Message:

Block Processor: Improve comment end search behavior.

Prevent WP_Block_Processor::find_html_comment_end() from repeatedly scanning some spans that cannot contain a comment end.

Developed in: ​https://github.com/WordPress/wordpress-develop/pull/13679

Props jonsurrell, dmsnell.
See #66138.

Location:

trunk

Files:

• src/wp-includes/class-wp-block-processor.php (modified) (1 diff)
• tests/phpunit/tests/block-processor/wpBlockProcessor.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-block-processor.php

@@ -1357 +1357 @@
                         }
 
-                        ++$now_at;
+                        $now_at = $closer_must_be_at;
                 }
 

trunk/tests/phpunit/tests/block-processor/wpBlockProcessor.php

@@ -243 +243 @@
          *
          * @ticket 61401
+         * @ticket 66138
          *
          * @dataProvider data_invalid_block_delimiters_as_html_comments
@@ -300 +301 @@
                         'Malformed block name'          => array( '<!-- wp:core/paragraph/variation -->' ),
                         'Invalid block name characters' => array( '<!-- wp:core/32-block -->' ),
+                        'Dash run'                      => array( '<!--x-----y-->' ),
+                        'Dash run then bang'            => array( '<!--x---!y-->' ),
+                        'Bang then dashes'              => array( '<!--x--!-y-->' ),
+                        'Dash run then bang closer'     => array( '<!--x---!>' ),
+                        'Bang then dash then closer'    => array( '<!--x--!-->' ),
+                        'Long dash run'                 => array( '<!--x' . str_repeat( '-', 50000 ) . 'y-->' ),
                 );
         }