<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[19707] trunk: use maybe_unserialize() in update and API checks, Tighten up the checks on expected return data to avoid processing invalid responses after change.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19707">19707</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2012-01-08 03:48:05 +0000 (Sun, 08 Jan 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>use maybe_unserialize() in update and API checks, Tighten up the checks on expected return data to avoid processing invalid responses after change. See <a href="http://core.trac.wordpress.org/ticket/19617">#19617</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesplugininstallphp">trunk/wp-admin/includes/plugin-install.php</a></li>
<li><a href="#trunkwpadminincludesthemephp">trunk/wp-admin/includes/theme.php</a></li>
<li><a href="#trunkwpincludesupdatephp">trunk/wp-includes/update.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin-install.php (19706 => 19707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin-install.php 2012-01-07 19:08:48 UTC (rev 19706)
+++ trunk/wp-admin/includes/plugin-install.php 2012-01-08 03:48:05 UTC (rev 19707)
</span><span class="lines">@@ -45,9 +45,9 @@
</span><span class="cx"> if ( is_wp_error($request) ) {
</span><span class="cx"> $res = new WP_Error('plugins_api_failed', __('An Unexpected HTTP Error occurred during the API request.'), $request->get_error_message() );
</span><span class="cx"> } else {
</span><del>- $res = unserialize( wp_remote_retrieve_body( $request ) );
- if ( false === $res )
- $res = new WP_Error('plugins_api_failed', __('An unknown error occurred.'), wp_remote_retrieve_body( $request ) );
</del><ins>+ $res = maybe_unserialize( wp_remote_retrieve_body( $request ) );
+ if ( ! is_object( $res ) && ! is_array( $res ) )
+ $res = new WP_Error('plugins_api_failed', __('An unknown error occurred during the API request.'), wp_remote_retrieve_body( $request ) );
</ins><span class="cx"> }
</span><span class="cx"> } elseif ( !is_wp_error($res) ) {
</span><span class="cx"> $res->external = true;
</span></span></pre></div>
<a id="trunkwpadminincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme.php (19706 => 19707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme.php 2012-01-07 19:08:48 UTC (rev 19706)
+++ trunk/wp-admin/includes/theme.php 2012-01-08 03:48:05 UTC (rev 19707)
</span><span class="lines">@@ -409,12 +409,12 @@
</span><span class="cx"> if ( is_wp_error($request) ) {
</span><span class="cx"> $res = new WP_Error('themes_api_failed', __('An Unexpected HTTP Error occurred during the API request.'), $request->get_error_message() );
</span><span class="cx"> } else {
</span><del>- $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 ) );
</del><ins>+ $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 ) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>- //var_dump(array($args, $res));
</del><ins>+
</ins><span class="cx"> return apply_filters('themes_api_result', $res, $action, $args);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/update.php (19706 => 19707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/update.php 2012-01-07 19:08:48 UTC (rev 19706)
+++ trunk/wp-includes/update.php 2012-01-08 03:48:05 UTC (rev 19707)
</span><span class="lines">@@ -91,10 +91,11 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $body = trim( wp_remote_retrieve_body( $response ) );
</span><del>- if ( ! $body = maybe_unserialize( $body ) )
</del><ins>+ $body = maybe_unserialize( $body );
+
+ if ( ! is_array( $body ) || ! isset( $body['offers'] ) )
</ins><span class="cx"> return false;
</span><del>- if ( ! isset( $body['offers'] ) )
- return false;
</del><ins>+
</ins><span class="cx"> $offers = $body['offers'];
</span><span class="cx">
</span><span class="cx"> foreach ( $offers as &$offer ) {
</span><span class="lines">@@ -205,9 +206,9 @@
</span><span class="cx"> if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- $response = unserialize( wp_remote_retrieve_body( $raw_response ) );
</del><ins>+ $response = maybe_unserialize( wp_remote_retrieve_body( $raw_response ) );
</ins><span class="cx">
</span><del>- if ( false !== $response )
</del><ins>+ if ( is_array( $response ) )
</ins><span class="cx"> $new_option->response = $response;
</span><span class="cx"> else
</span><span class="cx"> $new_option->response = array();
</span><span class="lines">@@ -319,8 +320,8 @@
</span><span class="cx"> $new_update->last_checked = time( );
</span><span class="cx"> $new_update->checked = $checked;
</span><span class="cx">
</span><del>- $response = unserialize( wp_remote_retrieve_body( $raw_response ) );
- if ( false !== $response )
</del><ins>+ $response = maybe_unserialize( wp_remote_retrieve_body( $raw_response ) );
+ if ( is_array( $response ) )
</ins><span class="cx"> $new_update->response = $response;
</span><span class="cx">
</span><span class="cx"> set_site_transient( 'update_themes', $new_update );
</span></span></pre>
</div>
</div>
</body>
</html>