Context Navigation

Back to Ticket #25652

Ticket #25652: 25652.diff

File 25652.diff, 2.9 KB (added by dd32, 13 years ago)

src/wp-admin/includes/file.php

                         $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 );
+        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' ) );
+        if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+                /*
+                 * 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 );
+                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' ) );
+        }
         $needed_dirs = array_unique($needed_dirs);
         foreach ( $needed_dirs as $dir ) {
 …
                 $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 );
+        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' ) );
+        if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+                /*
+                 * 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 );
+                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' ) );
+        }
         $needed_dirs = array_unique($needed_dirs);
         foreach ( $needed_dirs as $dir ) {

Download in other formats:

Original Format

Make WordPress Core

Context Navigation

Ticket #25652: 25652.diff

src/wp-admin/includes/file.php

Download in other formats: