Make WordPress Core


Ignore:
Timestamp:
01/30/2024 02:51:40 PM (10 months ago)
Author:
jorbin
Message:

Grouped Backports to the 5.5 branch

  • Install: When populating options, maybe_serialize instead of always serialize.
  • Uploads: Check for and verify ZIP archives.

Merges [57388] and [57389] to the 5.5 branch.

Props costdev, peterwilsoncc, azaozz, tykoted, johnbillion, desrosj, afragen, jorbin, xknown.

Location:
branches/5.5
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/5.5

  • branches/5.5/src/wp-admin/includes/class-file-upload-upgrader.php

    r47122 r57400  
    6969            }
    7070
     71            if ( 'pluginzip' === $form || 'themezip' === $form ) {
     72                $archive_is_valid = false;
     73
     74                /** This filter is documented in wp-admin/includes/file.php */
     75                if ( class_exists( 'ZipArchive', false ) && apply_filters( 'unzip_file_use_ziparchive', true ) ) {
     76                    $archive          = new ZipArchive();
     77                    $archive_is_valid = $archive->open( $file['file'], ZIPARCHIVE::CHECKCONS );
     78
     79                    if ( true === $archive_is_valid ) {
     80                        $archive->close();
     81                    }
     82                } else {
     83                    require_once ABSPATH . 'wp-admin/includes/class-pclzip.php';
     84
     85                    $archive          = new PclZip( $file['file'] );
     86                    $archive_is_valid = is_array( $archive->properties() );
     87                }
     88
     89                if ( true !== $archive_is_valid ) {
     90                    wp_delete_file( $file['file'] );
     91                    wp_die( __( 'Incompatible Archive.' ) );
     92                }
     93            }
     94
    7195            $this->filename = $_FILES[ $form ]['name'];
    7296            $this->package  = $file['file'];
Note: See TracChangeset for help on using the changeset viewer.