WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Account for possible failures by disk_free_space(), as well as the potential need to copy the unzipped files. 

see #25576.

Built from https://develop.svn.wordpress.org/trunk@25776


git-svn-id: http://core.svn.wordpress.org/trunk@25689 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2013-10-14 20:58:09 +00:00
parent 1516b990f1
commit 145dbde82f
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-admin/includes/file.php
View File

@ -618,8 +618,13 @@ function _unzip_file_ziparchive($file, $to, $needed_dirs = array() ) {
$needed_dirs[] = $to . untrailingslashit(dirname($info['name'])); $needed_dirs[] = $to . untrailingslashit(dirname($info['name']));
} }
/*
* disk_free_space() could return false. Assume that any falsey value is an error.
* A disk that has zero free bytes has bigger problems.
* Require we have enough space to unzip the file and copy its contents, with a 10% buffer.
*/
$available_space = disk_free_space( WP_CONTENT_DIR ); $available_space = disk_free_space( WP_CONTENT_DIR );
if ( ( $uncompressed_size * 1.2 ) > $available_space ) if ( $available_space && ( $uncompressed_size * 2.1 ) > $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' ) ); 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' ) );
$needed_dirs = array_unique($needed_dirs); $needed_dirs = array_unique($needed_dirs);
@ -713,8 +718,13 @@ function _unzip_file_pclzip($file, $to, $needed_dirs = array()) {
$needed_dirs[] = $to . untrailingslashit( $file['folder'] ? $file['filename'] : dirname($file['filename']) ); $needed_dirs[] = $to . untrailingslashit( $file['folder'] ? $file['filename'] : dirname($file['filename']) );
} }
/*
* disk_free_space() could return false. Assume that any falsey value is an error.
* A disk that has zero free bytes has bigger problems.
* Require we have enough space to unzip the file and copy its contents, with a 10% buffer.
*/
$available_space = disk_free_space( WP_CONTENT_DIR ); $available_space = disk_free_space( WP_CONTENT_DIR );
if ( ( $uncompressed_size * 1.2 ) > $available_space ) if ( $available_space && ( $uncompressed_size * 2.1 ) > $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' ) ); 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' ) );
$needed_dirs = array_unique($needed_dirs); $needed_dirs = array_unique($needed_dirs);