<!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>[28942] trunk: Make wp_kses_no_null() remove any invalid control characters in a string.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/28942">28942</a></dd>
<dt>Author</dt> <dd>SergeyBiryukov</dd>
<dt>Date</dt> <dd>2014-07-01 18:00:50 +0000 (Tue, 01 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make wp_kses_no_null() remove any invalid control characters in a string.
props mauteri, miqrogroove.
fixes <a href="http://core.trac.wordpress.org/ticket/28506">#28506</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesksesphp">trunk/src/wp-includes/kses.php</a></li>
<li><a href="#trunktestsphpunittestsksesphp">trunk/tests/phpunit/tests/kses.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesksesphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/kses.php (28941 => 28942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/kses.php 2014-07-01 16:40:30 UTC (rev 28941)
+++ trunk/src/wp-includes/kses.php 2014-07-01 18:00:50 UTC (rev 28942)
</span><span class="lines">@@ -991,15 +991,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Removes any null characters in $string.
</del><ins>+ * Removes any invalid control characters in $string.
</ins><span class="cx"> *
</span><ins>+ * Also removes any instance of the '\0' string.
+ *
</ins><span class="cx"> * @since 1.0.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $string
</span><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="cx"> function wp_kses_no_null($string) {
</span><del>- $string = preg_replace('/\0+/', '', $string);
</del><ins>+ $string = preg_replace('/[\x00-\x08\x0B\x0C\x0E-\x1F]/', '', $string);
</ins><span class="cx"> $string = preg_replace('/(\\\\0)+/', '', $string);
</span><span class="cx">
</span><span class="cx"> return $string;
</span></span></pre></div>
<a id="trunktestsphpunittestsksesphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/kses.php (28941 => 28942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/kses.php 2014-07-01 16:40:30 UTC (rev 28941)
+++ trunk/tests/phpunit/tests/kses.php 2014-07-01 18:00:50 UTC (rev 28942)
</span><span class="lines">@@ -374,4 +374,41 @@
</span><span class="cx"> $this->assertEquals( '¾', wp_kses_normalize_entities( '¾' ) );
</span><span class="cx"> $this->assertEquals( '∴', wp_kses_normalize_entities( '∴' ) );
</span><span class="cx"> }
</span><ins>+
+ /**
+ * Test removal of invalid binary data for HTML.
+ *
+ * @ticket 28506
+ * @dataProvider data_ctrl_removal
+ */
+ function test_ctrl_removal( $input, $output ) {
+ global $allowedposttags;
+
+ return $this->assertEquals( $output, wp_kses( $input, $allowedposttags ) );
+ }
+
+ function data_ctrl_removal() {
+ return array(
+ array(
+ "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x0B\x0C\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\X1C\x1D\x1E\x1F",
+ '',
+ ),
+ array(
+ "\x00h\x01e\x02l\x03l\x04o\x05 \x06w\x07o\x08r\x0Bl\x0Cd\x0E.\x0F \x10W\x11O\x12R\x13D\x14P\x15R\x16E\x17S\x18S\x19 \x1AK\x1BS\X1CE\x1DS\x1E.\x1F/",
+ 'hello world. WORDPRESS KSES./',
+ ),
+ array(
+ "\x1F\x1E\x1D\x1C\x1B\x1A\x19\x18\x17\x16\x15\x14\x13\x12\x11\x10\x0F\x0E\x0C\x0B\x08\x07\x06\x05\x04\X03\x02\x01\x00",
+ '',
+ ),
+ array(
+ "\x1Fh\x1Ee\x1Dl\x1Cl\x1Bo\x1A \x19w\x18o\x17r\x16l\x15d\x14.\x13 \x12W\x11O\x10R\x0FD\x0EP\x0CR\x0BE\x08S\x07S\x06 \x05K\x04S\X03E\x02S\x01.\x00/",
+ 'hello world. WORDPRESS KSES./',
+ ),
+ array(
+ "\t\r\n word \n\r\t",
+ "\t\r\n word \n\r\t",
+ ),
+ );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>