Changeset 47454 for trunk

Timestamp:

03/13/2020 09:12:01 PM (4 years ago)

Author:

SergeyBiryukov

Message:

General: Trim the input data in maybe_unserialize(), for consistency with is_serialized().

Props pbearne, mikeschroder.
Fixes #36416.

Location:

trunk

Files:

• src/wp-includes/functions.php (modified) (1 diff)
• tests/phpunit/tests/functions.php (modified) (1 diff)

trunk/src/wp-includes/functions.php

@@ -617 +617 @@
 function maybe_unserialize( $data ) {
     if ( is_serialized( $data ) ) { // Don't attempt to unserialize data that wasn't serialized going in.
-        return @unserialize( $data );
+        return @unserialize( trim( $data ) );
     }
 

trunk/tests/phpunit/tests/functions.php

@@ -292 +292 @@
                 true,
             ),
+            array( '   s:25:"this string is serialized";   ', true ),
         );
     }