Changeset 28806

Timestamp:

06/23/2014 02:47:08 PM (10 years ago)

Author:

SergeyBiryukov

Message:

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 #28162.

Location:

trunk/src

Files:

• wp-admin/includes/image.php (modified) (2 diffs)
• wp-includes/formatting.php (modified) (2 diffs)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/pomo/mo.php (modified) (3 diffs)

trunk/src/wp-admin/includes/image.php

@@ -291 +291 @@
                 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
@@ -328 +328 @@
 
         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'] );

trunk/src/wp-includes/formatting.php

@@ -482 +482 @@
  */
 function seems_utf8($str) {
-    $length = strlen($str);
+    $length = mbstring_binary_safe_strlen($str);
     for ($i=0; $i < $length; $i++) {
         $c = ord($str[$i]);
@@ -706 +706 @@
     $unicode_length = 0;
 
-    $string_length = strlen( $utf8_string );
+    $string_length = mbstring_binary_safe_strlen( $utf8_string );
     for ($i = 0; $i < $string_length; $i++ ) {
 

trunk/src/wp-includes/functions.php

@@ -4406 +4406 @@
 
 /**
+ * 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;
+}
+
+/**
  * Alternative to filter_var( $var, FILTER_VALIDATE_BOOLEAN )
  *

trunk/src/wp-includes/pomo/mo.php

@@ -76 +76 @@
         $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
@@ -84 +86 @@
 
         $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);
@@ -90 +92 @@
         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;