Changeset 19707 for trunk/wp-admin/includes/theme.php

Timestamp:

01/08/2012 03:48:05 AM (13 years ago)

Author:

dd32

Message:

use maybe_unserialize() in update and API checks, Tighten up the checks on expected return data to avoid processing invalid responses after change. See #19617

File:

• trunk/wp-admin/includes/theme.php (modified) (1 diff)

trunk/wp-admin/includes/theme.php

@@ -410 +410 @@
             $res = new WP_Error('themes_api_failed', __('An Unexpected HTTP Error occurred during the API request.'), $request->get_error_message() );
         } else {
-            $res = unserialize( wp_remote_retrieve_body( $request ) );
-            if ( ! $res )
-            $res = new WP_Error('themes_api_failed', __('An unknown error occurred.'), wp_remote_retrieve_body( $request ) );
-        }
-    }
-    //var_dump(array($args, $res));
+            $res = maybe_unserialize( wp_remote_retrieve_body( $request ) );
+            if ( ! is_object( $res ) && ! is_array( $res ) )
+                $res = new WP_Error('themes_api_failed', __('An unknown error occurred during the API request.'), wp_remote_retrieve_body( $request ) );
+        }
+    }
+
     return apply_filters('themes_api_result', $res, $action, $args);
 }