Changeset 44281 for trunk/src/wp-includes/class-wp-block-parser.php

Timestamp:

12/17/2018 09:58:12 PM (6 years ago)

Author:

desrosj

Message:

Block Editor: Update @wordpress package dependencies.

Updates the following packages:

block-library, block-serialization-default-parser, block-serialization-spec-parser, blocks, edit-post, editor, format-library.

Merges [43955] to trunk.

Props youknowriad.

Fixes #45145.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-block-parser.php (modified) (3 diffs)

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

@@ -365 +365 @@
      * @internal
      * @since 3.8.0
+     * @since 4.6.1 fixed a bug in attribute parsing which caused catastrophic backtracking on invalid block comments
      * @return array
      */
@@ -379 +380 @@
          */
         $has_match = preg_match(
-            '/<!--\s+(?<closer>\/)?wp:(?<namespace>[a-z][a-z0-9_-]*\/)?(?<name>[a-z][a-z0-9_-]*)\s+(?<attrs>{(?:[^}]+|}+(?=})|(?!}\s+-->).)*?}\s+)?(?<void>\/)?-->/s',
+            '/<!--\s+(?<closer>\/)?wp:(?<namespace>[a-z][a-z0-9_-]*\/)?(?<name>[a-z][a-z0-9_-]*)\s+(?<attrs>{(?:(?:[^}]+|}+(?=})|(?!}\s+\/?-->).)*+)?}\s+)?(?<void>\/)?-->/s',
             $this->document,
             $matches,
@@ -385 +386 @@
             $this->offset
         );
+
+        // if we get here we probably have catastrophic backtracking or out-of-memory in the PCRE
+        if ( false === $has_match ) {
+            return array( 'no-more-tokens', null, null, null, null );
+        }
 
         // we have no more tokens