<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[18952] trunk/wp-includes: Avoid preg backtrack limit errors with large posts when processing shortcodes.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/18952">18952</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-10-12 16:50:30 +0000 (Wed, 12 Oct 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Avoid preg backtrack limit errors with large posts when processing shortcodes. Props mdawaffe. fixes <a href="http://core.trac.wordpress.org/ticket/15600">#15600</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
<li><a href="#trunkwpincludesshortcodesphp">trunk/wp-includes/shortcodes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (18951 => 18952)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2011-10-12 16:35:33 UTC (rev 18951)
+++ trunk/wp-includes/formatting.php 2011-10-12 16:50:30 UTC (rev 18952)
</span><span class="lines">@@ -232,16 +232,48 @@
</span><span class="cx"> * @param string $pee The content.
</span><span class="cx"> * @return string The filtered content.
</span><span class="cx"> */
</span><del>-function shortcode_unautop($pee) {
</del><ins>+function shortcode_unautop( $pee ) {
</ins><span class="cx"> global $shortcode_tags;
</span><span class="cx">
</span><del>- if ( !empty($shortcode_tags) && is_array($shortcode_tags) ) {
- $tagnames = array_keys($shortcode_tags);
- $tagregexp = join( '|', array_map('preg_quote', $tagnames) );
- $pee = preg_replace('/<p>\\s*?(\\[(' . $tagregexp . ')\\b.*?\\/?\\](?:.+?\\[\\/\\2\\])?)\\s*<\\/p>/s', '$1', $pee);
</del><ins>+ if ( empty( $shortcode_tags ) || !is_array( $shortcode_tags ) ) {
+ return $pee;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return $pee;
</del><ins>+ $tagregexp = join( '|', array_map( 'preg_quote', array_keys( $shortcode_tags ) ) );
+
+ $pattern =
+ '/'
+ . '<p>' // Opening paragraph
+ . '\\s*+' // Optional leading whitespace
+ . '(' // 1: The shortcode
+ . '\\[' // Opening bracket
+ . "($tagregexp)" // 2: Shortcode name
+ . '\\b' // Word boundary
+ // Unroll the loop: Inside the opening shortcode tag
+ . '[^\\]\\/]*' // Not a closing bracket or forward slash
+ . '(?:'
+ . '\\/(?!\\])' // A forward slash not followed by a closing bracket
+ . '[^\\]\\/]*' // Not a closing bracket or forward slash
+ . ')*?'
+ . '(?:'
+ . '\\/\\]' // Self closing tag and closing bracket
+ . '|'
+ . '\\]' // Closing bracket
+ . '(?:' // Unroll the loop: Optionally, anything between the opening and closing shortcode tags
+ . '[^\\[]*+' // Not an opening bracket
+ . '(?:'
+ . '\\[(?!\\/\\2\\])' // An opening bracket not followed by the closing shortcode tag
+ . '[^\\[]*+' // Not an opening bracket
+ . ')*+'
+ . '\\[\\/\\2\\]' // Closing shortcode tag
+ . ')?'
+ . ')'
+ . ')'
+ . '\\s*+' // optional trailing whitespace
+ . '<\\/p>' // closing paragraph
+ . '/s';
+
+ return preg_replace( $pattern, '$1', $pee );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludesshortcodesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/shortcodes.php (18951 => 18952)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/shortcodes.php 2011-10-12 16:35:33 UTC (rev 18951)
+++ trunk/wp-includes/shortcodes.php 2011-10-12 16:50:30 UTC (rev 18952)
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> return $content;
</span><span class="cx">
</span><span class="cx"> $pattern = get_shortcode_regex();
</span><del>- return preg_replace_callback('/'.$pattern.'/s', 'do_shortcode_tag', $content);
</del><ins>+ return preg_replace_callback( "/$pattern/s", 'do_shortcode_tag', $content );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -159,11 +159,12 @@
</span><span class="cx"> *
</span><span class="cx"> * The regular expression contains 6 different sub matches to help with parsing.
</span><span class="cx"> *
</span><del>- * 1/6 - An extra [ or ] to allow for escaping shortcodes with double [[]]
</del><ins>+ * 1 - An extra [ to allow for escaping shortcodes with double [[]]
</ins><span class="cx"> * 2 - The shortcode name
</span><span class="cx"> * 3 - The shortcode argument list
</span><span class="cx"> * 4 - The self closing /
</span><span class="cx"> * 5 - The content of a shortcode when it wraps some content.
</span><ins>+ * 6 - An extra ] to allow for escaping shortcodes with double [[]]
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.5
</span><span class="cx"> * @uses $shortcode_tags
</span><span class="lines">@@ -175,8 +176,36 @@
</span><span class="cx"> $tagnames = array_keys($shortcode_tags);
</span><span class="cx"> $tagregexp = join( '|', array_map('preg_quote', $tagnames) );
</span><span class="cx">
</span><del>- // WARNING! Do not change this regex without changing do_shortcode_tag() and strip_shortcodes()
- return '(.?)\[('.$tagregexp.')\b(.*?)(?:(\/))?\](?:(.+?)\[\/\2\])?(.?)';
</del><ins>+ // WARNING! Do not change this regex without changing do_shortcode_tag() and strip_shortcode_tag()
+ return
+ '\\[' // Opening bracket
+ . '(\\[?)' // 1: Optional second opening bracket for escaping shortcodes: [[tag]]
+ . "($tagregexp)" // 2: Shortcode name
+ . '\\b' // Word boundary
+ . '(' // 3: Unroll the loop: Inside the opening shortcode tag
+ . '[^\\]\\/]*' // Not a closing bracket or forward slash
+ . '(?:'
+ . '\\/(?!\\])' // A forward slash not followed by a closing bracket
+ . '[^\\]\\/]*' // Not a closing bracket or forward slash
+ . ')*?'
+ . ')'
+ . '(?:'
+ . '(\\/)' // 4: Self closing tag ...
+ . '\\]' // ... and closing bracket
+ . '|'
+ . '\\]' // Closing bracket
+ . '(?:'
+ . '(' // 5: Unroll the loop: Optionally, anything between the opening and closing shortcode tags
+ . '[^\\[]*+' // Not an opening bracket
+ . '(?:'
+ . '\\[(?!\\/\\2\\])' // An opening bracket not followed by the closing shortcode tag
+ . '[^\\[]*+' // Not an opening bracket
+ . ')*+'
+ . ')'
+ . '\\[\\/\\2\\]' // Closing shortcode tag
+ . ')?'
+ . ')'
+ . '(\\]?)'; // 6: Optional second closing brocket for escaping shortcodes: [[tag]]
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -290,9 +319,18 @@
</span><span class="cx">
</span><span class="cx"> $pattern = get_shortcode_regex();
</span><span class="cx">
</span><del>- return preg_replace('/'.$pattern.'/s', '$1$6', $content);
</del><ins>+ return preg_replace_callback( "/$pattern/s", 'strip_shortcode_tag', $content );
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+function strip_shortcode_tag( $m ) {
+ // allow [[foo]] syntax for escaping a tag
+ if ( $m[1] == '[' && $m[6] == ']' ) {
+ return substr($m[0], 1, -1);
+ }
+
+ return $m[1] . $m[6];
+}
+
</ins><span class="cx"> add_filter('the_content', 'do_shortcode', 11); // AFTER wpautop()
</span><span class="cx">
</span><del>-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+?>
</ins></span></pre>
</div>
</div>
</body>
</html>