Changeset 25774

Timestamp:

10/14/2013 08:14:13 PM (12 years ago)

Author:

nacin

Message:

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 #25576.

Location:

trunk/src

Files:

• wp-admin/includes/file.php (modified) (5 diffs)
• wp-includes/version.php (modified) (1 diff)

trunk/src/wp-admin/includes/file.php

@@ -602 +602 @@
         return new WP_Error('incompatible_archive', __('Incompatible Archive.'));
 
+    $uncompressed_size = 0;
+
     for ( $i = 0; $i < $z->numFiles; $i++ ) {
         if ( ! $info = $z->statIndex($i) )
@@ -608 +610 @@
         if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Skip the OS X-created __MACOSX directory
             continue;
+
+        $uncompressed_size += $info['size'];
 
         if ( '/' == substr($info['name'], -1) ) // directory
@@ -614 +618 @@
             $needed_dirs[] = $to . untrailingslashit(dirname($info['name']));
     }
+
+    $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' ) );
 
     $needed_dirs = array_unique($needed_dirs);
@@ -694 +702 @@
         return new WP_Error( 'empty_archive_pclzip', __( 'Empty archive.' ) );
 
+    $uncompressed_size = 0;
+
     // Determine any children directories needed (From within the archive)
     foreach ( $archive_files as $file ) {
@@ -699 +709 @@
             continue;
 
+        $uncompressed_size += $file['size'];
+
         $needed_dirs[] = $to . untrailingslashit( $file['folder'] ? $file['filename'] : dirname($file['filename']) );
     }
+
+    $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' ) );
 
     $needed_dirs = array_unique($needed_dirs);

trunk/src/wp-includes/version.php

@@ -5 +5 @@
  * @global string $wp_version
  */
-$wp_version = '3.7-beta2-25773-src';
+$wp_version = '3.7-beta2-25774-src';
 
 /**