Changeset 27565 for trunk/src/wp-includes/functions.php

Timestamp:

03/17/2014 08:08:25 PM (11 years ago)

Author:

nacin

Message:

In is_serialized(), use substr() rather than array access, for compatibility with multibyte overloading.

props SergeyBiryukov.
fixes #18007.

File:

• trunk/src/wp-includes/functions.php (modified) (3 diffs)

trunk/src/wp-includes/functions.php

@@ -252 +252 @@
 function is_serialized( $data, $strict = true ) {
     // if it isn't a string, it isn't serialized
-    if ( ! is_string( $data ) )
+    if ( ! is_string( $data ) ) {
         return false;
+    }
     $data = trim( $data );
-    if ( 'N;' == $data )
+    if ( 'N;' == $data ) {
         return true;
-    $length = strlen( $data );
-    if ( $length < 4 )
+    }
+    if ( strlen( $data ) < 4 ) {
         return false;
-    if ( ':' !== $data[1] )
+    }
+    if ( ':' !== $data[1] ) {
         return false;
+    }
     if ( $strict ) {
-        $lastc = $data[ $length - 1 ];
-        if ( ';' !== $lastc && '}' !== $lastc )
+        $lastc = substr( $data, -1 );
+        if ( ';' !== $lastc && '}' !== $lastc ) {
             return false;
+        }
     } else {
         $semicolon = strpos( $data, ';' );
@@ -282 +286 @@
         case 's' :
             if ( $strict ) {
-                if ( '"' !== $data[ $length - 2 ] )
+                if ( '"' !== substr( $data, -2, 1 ) ) {
                     return false;
+                }
             } elseif ( false === strpos( $data, '"' ) ) {
                 return false;
@@ -310 +315 @@
 function is_serialized_string( $data ) {
     // if it isn't a string, it isn't a serialized string
-    if ( !is_string( $data ) )
+    if ( ! is_string( $data ) ) {
         return false;
+    }
     $data = trim( $data );
-    $length = strlen( $data );
-    if ( $length < 4 )
+    if ( strlen( $data ) < 4 ) {
         return false;
-    elseif ( ':' !== $data[1] )
+    } elseif ( ':' !== $data[1] ) {
         return false;
-    elseif ( ';' !== $data[$length-1] )
+    } elseif ( ';' !== substr( $data, -1 ) ) {
         return false;
-    elseif ( $data[0] !== 's' )
+    } elseif ( $data[0] !== 's' ) {
         return false;
-    elseif ( '"' !== $data[$length-2] )
+    } elseif ( '"' !== substr( $data, -2, 1 ) ) {
         return false;
-    else
+    } else {
         return true;
+    }
 }