<!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>[28806] trunk/src: Introduce a binary-safe wrapper for strlen() and use it in seems_utf8(), utf8_uri_encode(), and wp_read_image_metadata().</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/28806">28806</a></dd>
<dt>Author</dt> <dd>SergeyBiryukov</dd>
<dt>Date</dt> <dd>2014-06-23 14:47:08 +0000 (Mon, 23 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce a binary-safe wrapper for strlen() and use it in seems_utf8(), utf8_uri_encode(), and wp_read_image_metadata().
Use binary-safe POMO_Reader::strlen() in MO::export_to_file_handle().
fixes <a href="http://core.trac.wordpress.org/ticket/28162">#28162</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesimagephp">trunk/src/wp-admin/includes/image.php</a></li>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludespomomophp">trunk/src/wp-includes/pomo/mo.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesimagephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/image.php (28805 => 28806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/image.php 2014-06-23 14:30:14 UTC (rev 28805)
+++ trunk/src/wp-admin/includes/image.php 2014-06-23 14:47:08 UTC (rev 28806)
</span><span class="lines">@@ -290,7 +290,7 @@
</span><span class="cx"> $caption = trim( $iptc['2#120'][0] );
</span><span class="cx"> if ( empty( $meta['title'] ) ) {
</span><span class="cx"> // Assume the title is stored in 2:120 if it's short.
</span><del>- if ( strlen( $caption ) < 80 )
</del><ins>+ if ( mbstring_binary_safe_strlen( $caption ) < 80 )
</ins><span class="cx"> $meta['title'] = $caption;
</span><span class="cx"> else
</span><span class="cx"> $meta['caption'] = $caption;
</span><span class="lines">@@ -327,7 +327,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $exif['ImageDescription'] ) ) {
</span><del>- if ( empty( $meta['title'] ) && strlen( $exif['ImageDescription'] ) < 80 ) {
</del><ins>+ if ( empty( $meta['title'] ) && mbstring_binary_safe_strlen( $exif['ImageDescription'] ) < 80 ) {
</ins><span class="cx"> // Assume the title is stored in ImageDescription
</span><span class="cx"> $meta['title'] = trim( $exif['ImageDescription'] );
</span><span class="cx"> if ( empty( $meta['caption'] ) && ! empty( $exif['COMPUTED']['UserComment'] ) && trim( $exif['COMPUTED']['UserComment'] ) != $meta['title'] ) {
</span></span></pre></div>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/formatting.php (28805 => 28806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/formatting.php 2014-06-23 14:30:14 UTC (rev 28805)
+++ trunk/src/wp-includes/formatting.php 2014-06-23 14:47:08 UTC (rev 28806)
</span><span class="lines">@@ -481,7 +481,7 @@
</span><span class="cx"> * @return bool True if $str fits a UTF-8 model, false otherwise.
</span><span class="cx"> */
</span><span class="cx"> function seems_utf8($str) {
</span><del>- $length = strlen($str);
</del><ins>+ $length = mbstring_binary_safe_strlen($str);
</ins><span class="cx"> for ($i=0; $i < $length; $i++) {
</span><span class="cx"> $c = ord($str[$i]);
</span><span class="cx"> if ($c < 0x80) $n = 0; # 0bbbbbbb
</span><span class="lines">@@ -705,7 +705,7 @@
</span><span class="cx"> $num_octets = 1;
</span><span class="cx"> $unicode_length = 0;
</span><span class="cx">
</span><del>- $string_length = strlen( $utf8_string );
</del><ins>+ $string_length = mbstring_binary_safe_strlen( $utf8_string );
</ins><span class="cx"> for ($i = 0; $i < $string_length; $i++ ) {
</span><span class="cx">
</span><span class="cx"> $value = ord( $utf8_string[ $i ] );
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/functions.php (28805 => 28806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/functions.php 2014-06-23 14:30:14 UTC (rev 28805)
+++ trunk/src/wp-includes/functions.php 2014-06-23 14:47:08 UTC (rev 28806)
</span><span class="lines">@@ -4405,6 +4405,24 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Uses a binary-safe encoding to get the length of a string in bytes if func_overload is enabled.
+ *
+ * @see mbstring_binary_safe_encoding()
+ *
+ * @since 4.0.0
+ *
+ * @param string $string The string to get the length of.
+ * @return int The length of the string in bytes.
+ */
+function mbstring_binary_safe_strlen( $string ) {
+ mbstring_binary_safe_encoding();
+ $length = strlen( $string );
+ reset_mbstring_encoding();
+
+ return $length;
+}
+
+/**
</ins><span class="cx"> * Alternative to filter_var( $var, FILTER_VALIDATE_BOOLEAN )
</span><span class="cx"> *
</span><span class="cx"> * @since 4.0.0
</span></span></pre></div>
<a id="trunksrcwpincludespomomophp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/pomo/mo.php (28805 => 28806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/pomo/mo.php 2014-06-23 14:30:14 UTC (rev 28805)
+++ trunk/src/wp-includes/pomo/mo.php 2014-06-23 14:47:08 UTC (rev 28806)
</span><span class="lines">@@ -75,21 +75,23 @@
</span><span class="cx"> $current_addr++;
</span><span class="cx"> $originals_table = chr(0);
</span><span class="cx">
</span><ins>+ $reader = new POMO_Reader();
+
</ins><span class="cx"> foreach($entries as $entry) {
</span><span class="cx"> $originals_table .= $this->export_original($entry) . chr(0);
</span><del>- $length = strlen($this->export_original($entry));
</del><ins>+ $length = $reader->strlen($this->export_original($entry));
</ins><span class="cx"> fwrite($fh, pack('VV', $length, $current_addr));
</span><span class="cx"> $current_addr += $length + 1; // account for the NULL byte after
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $exported_headers = $this->export_headers();
</span><del>- fwrite($fh, pack('VV', strlen($exported_headers), $current_addr));
</del><ins>+ fwrite($fh, pack('VV', $reader->strlen($exported_headers), $current_addr));
</ins><span class="cx"> $current_addr += strlen($exported_headers) + 1;
</span><span class="cx"> $translations_table = $exported_headers . chr(0);
</span><span class="cx">
</span><span class="cx"> foreach($entries as $entry) {
</span><span class="cx"> $translations_table .= $this->export_translations($entry) . chr(0);
</span><del>- $length = strlen($this->export_translations($entry));
</del><ins>+ $length = $reader->strlen($this->export_translations($entry));
</ins><span class="cx"> fwrite($fh, pack('VV', $length, $current_addr));
</span><span class="cx"> $current_addr += $length + 1;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>