<!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>[25774] trunk/src: In unzip_file(), confirm we have enough available disk space before extracting.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/25774">25774</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-10-14 20:14:13 +0000 (Mon, 14 Oct 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>In unzip_file(), confirm we have enough available disk space before extracting.
"enough" is calculated by adding up the uncompressed size of the files in the archive, then adding a 20% buffer.
props dd32.
fixes <a href="http://core.trac.wordpress.org/ticket/25576">#25576</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesfilephp">trunk/src/wp-admin/includes/file.php</a></li>
<li><a href="#trunksrcwpincludesversionphp">trunk/src/wp-includes/version.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesfilephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/file.php (25773 => 25774)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/file.php 2013-10-14 19:39:06 UTC (rev 25773)
+++ trunk/src/wp-admin/includes/file.php 2013-10-14 20:14:13 UTC (rev 25774)
</span><span class="lines">@@ -601,6 +601,8 @@
</span><span class="cx"> if ( true !== $zopen )
</span><span class="cx"> return new WP_Error('incompatible_archive', __('Incompatible Archive.'));
</span><span class="cx">
</span><ins>+ $uncompressed_size = 0;
+
</ins><span class="cx"> for ( $i = 0; $i < $z->numFiles; $i++ ) {
</span><span class="cx"> if ( ! $info = $z->statIndex($i) )
</span><span class="cx"> return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
</span><span class="lines">@@ -608,12 +610,18 @@
</span><span class="cx"> if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Skip the OS X-created __MACOSX directory
</span><span class="cx"> continue;
</span><span class="cx">
</span><ins>+ $uncompressed_size += $info['size'];
+
</ins><span class="cx"> if ( '/' == substr($info['name'], -1) ) // directory
</span><span class="cx"> $needed_dirs[] = $to . untrailingslashit($info['name']);
</span><span class="cx"> else
</span><span class="cx"> $needed_dirs[] = $to . untrailingslashit(dirname($info['name']));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ $available_space = disk_free_space( WP_CONTENT_DIR );
+ if ( ( $uncompressed_size * 1.2 ) > $available_space )
+ return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) );
+
</ins><span class="cx"> $needed_dirs = array_unique($needed_dirs);
</span><span class="cx"> foreach ( $needed_dirs as $dir ) {
</span><span class="cx"> // Check the parent folders of the folders all exist within the creation array.
</span><span class="lines">@@ -693,14 +701,22 @@
</span><span class="cx"> if ( 0 == count($archive_files) )
</span><span class="cx"> return new WP_Error( 'empty_archive_pclzip', __( 'Empty archive.' ) );
</span><span class="cx">
</span><ins>+ $uncompressed_size = 0;
+
</ins><span class="cx"> // Determine any children directories needed (From within the archive)
</span><span class="cx"> foreach ( $archive_files as $file ) {
</span><span class="cx"> if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) // Skip the OS X-created __MACOSX directory
</span><span class="cx"> continue;
</span><span class="cx">
</span><ins>+ $uncompressed_size += $file['size'];
+
</ins><span class="cx"> $needed_dirs[] = $to . untrailingslashit( $file['folder'] ? $file['filename'] : dirname($file['filename']) );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ $available_space = disk_free_space( WP_CONTENT_DIR );
+ if ( ( $uncompressed_size * 1.2 ) > $available_space )
+ return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) );
+
</ins><span class="cx"> $needed_dirs = array_unique($needed_dirs);
</span><span class="cx"> foreach ( $needed_dirs as $dir ) {
</span><span class="cx"> // Check the parent folders of the folders all exist within the creation array.
</span></span></pre></div>
<a id="trunksrcwpincludesversionphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/version.php (25773 => 25774)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/version.php 2013-10-14 19:39:06 UTC (rev 25773)
+++ trunk/src/wp-includes/version.php 2013-10-14 20:14:13 UTC (rev 25774)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @global string $wp_version
</span><span class="cx"> */
</span><del>-$wp_version = '3.7-beta2-25773-src';
</del><ins>+$wp_version = '3.7-beta2-25774-src';
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
</span></span></pre>
</div>
</div>
</body>
</html>