Ticket #28162: 28162.5.patch

src/wp-admin/includes/image.php

@@ -290 +290 @@
                                 $caption = trim( $iptc['2#120'][0] );
                                 if ( empty( $meta['title'] ) ) {
                                         // Assume the title is stored in 2:120 if it's short.
-                                        if ( strlen( $caption ) < 80 )
+                                        if ( mbstring_binary_safe_strlen( $caption ) < 80 )
                                                 $meta['title'] = $caption;
                                         else
                                                 $meta['caption'] = $caption;
@@ -327 +327 @@
                 }
 
                 if ( ! empty( $exif['ImageDescription'] ) ) {
-                        if ( empty( $meta['title'] ) && strlen( $exif['ImageDescription'] ) < 80 ) {
+                        if ( empty( $meta['title'] ) && mbstring_binary_safe_strlen( $exif['ImageDescription'] ) < 80 ) {
                                 // Assume the title is stored in ImageDescription
                                 $meta['title'] = trim( $exif['ImageDescription'] );
                                 if ( empty( $meta['caption'] ) && ! empty( $exif['COMPUTED']['UserComment'] ) && trim( $exif['COMPUTED']['UserComment'] ) != $meta['title'] ) {

src/wp-includes/formatting.php

@@ -410 +410 @@
  * @return bool True if $str fits a UTF-8 model, false otherwise.
  */
 function seems_utf8($str) {
-        $length = strlen($str);
+        $length = mbstring_binary_safe_strlen($str);
         for ($i=0; $i < $length; $i++) {
                 $c = ord($str[$i]);
                 if ($c < 0x80) $n = 0; # 0bbbbbbb
@@ -634 +634 @@
         $num_octets = 1;
         $unicode_length = 0;
 
-        $string_length = strlen( $utf8_string );
+        $string_length = mbstring_binary_safe_strlen( $utf8_string );
         for ($i = 0; $i < $string_length; $i++ ) {
 
                 $value = ord( $utf8_string[ $i ] );

src/wp-includes/functions.php

@@ -4437 +4437 @@
 }
 
 /**
+ * Uses a binary-safe encoding to get string length in bytes if func_overload is enabled.
+ *
+ * @see mbstring_binary_safe_encoding()
+ *
+ * @since 4.0.0
+ */
+function mbstring_binary_safe_strlen( $string ) {
+        mbstring_binary_safe_encoding();
+        $length = strlen( $string );
+        reset_mbstring_encoding();
+
+        return $length;
+}
+
+/**
  * Alternative to filter_var( $var, FILTER_VALIDATE_BOOLEAN )
  *
  * @since 4.0.0

src/wp-includes/pomo/mo.php

@@ -75 +75 @@
                 $current_addr++;
                 $originals_table = chr(0);
 
+                $reader = new POMO_Reader();
+
                 foreach($entries as $entry) {
                         $originals_table .= $this->export_original($entry) . chr(0);
-                        $length = strlen($this->export_original($entry));
+                        $length = $reader->strlen($this->export_original($entry));
                         fwrite($fh, pack('VV', $length, $current_addr));
                         $current_addr += $length + 1; // account for the NULL byte after
                 }
 
                 $exported_headers = $this->export_headers();
-                fwrite($fh, pack('VV', strlen($exported_headers), $current_addr));
+                fwrite($fh, pack('VV', $reader->strlen($exported_headers), $current_addr));
                 $current_addr += strlen($exported_headers) + 1;
                 $translations_table = $exported_headers . chr(0);
 
                 foreach($entries as $entry) {
                         $translations_table .= $this->export_translations($entry) . chr(0);
-                        $length = strlen($this->export_translations($entry));
+                        $length = $reader->strlen($this->export_translations($entry));
                         fwrite($fh, pack('VV', $length, $current_addr));
                         $current_addr += $length + 1;
                 }