Changeset 29431 for trunk/src/wp-includes/formatting.php

Timestamp:

08/07/2014 07:10:13 PM (10 years ago)

Author:

wonderboymusic

Message:

wptexturize: After [28727], leverage RegeEx possessives (++) to improve performance and avoid libpcre segfaults.

Props kovshenin.
Fixes #12690.

File:

• trunk/src/wp-includes/formatting.php (modified) (2 diffs)

trunk/src/wp-includes/formatting.php

@@ -220 +220 @@
         .   '|'
         .       '<[^>]+>'   // HTML elements permitted. Prevents matching ] before >.
-        .   ')+'
+        .   ')++'
         .   '\]'        // Find end of shortcode.
         .   '\]?'       // Shortcodes may end with ]]
@@ -242 +242 @@
             continue;
 
-        } elseif ( '[' === $first && 1 === preg_match( '/^\[(?:[^\[\]<>]|<[^>]+>)+\]$/', $curl ) ) {
+        } elseif ( '[' === $first && 1 === preg_match( '/^\[(?:[^\[\]<>]|<[^>]+>)++\]$/', $curl ) ) {
             // This is a shortcode delimeter.
 
             _wptexturize_pushpop_element( $curl, $no_texturize_shortcodes_stack, $no_texturize_shortcodes );
 
-        } elseif ( '[' === $first && 1 === preg_match( '/^\[\[?(?:[^\[\]<>]|<[^>]+>)+\]\]?$/', $curl ) ) {
+        } elseif ( '[' === $first && 1 === preg_match( '/^\[\[?(?:[^\[\]<>]|<[^>]+>)++\]\]?$/', $curl ) ) {
             // This is an escaped shortcode delimeter.