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

Media: Return a `WP_Error` from `WP_Image_Editor_GD::load()` if file contents could not be retrieved. 

This avoids an error on PHP 8 caused by calling `imagecreatefromstring()` on an empty result.

See #50913.
Built from https://develop.svn.wordpress.org/trunk@49019


git-svn-id: http://core.svn.wordpress.org/trunk@48781 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-09-20 14:28:05 +00:00
parent 8752dbaaba
commit 2884b7b1b7
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/class-wp-image-editor-gd.php
View File

@ -93,13 +93,20 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
// Set artificially high because GD uses uncompressed images in memory. // Set artificially high because GD uses uncompressed images in memory.
wp_raise_memory_limit( 'image' ); wp_raise_memory_limit( 'image' );
$this->image = @imagecreatefromstring( file_get_contents( $this->file ) ); $file_contents = @file_get_contents( $this->file );
if ( ! $file_contents ) {
return new WP_Error( 'error_loading_image', __( 'File doesn’t exist?' ), $this->file );
}
$this->image = @imagecreatefromstring( $file_contents );
if ( ! is_gd_image( $this->image ) ) { if ( ! is_gd_image( $this->image ) ) {
return new WP_Error( 'invalid_image', __( 'File is not an image.' ), $this->file ); return new WP_Error( 'invalid_image', __( 'File is not an image.' ), $this->file );
} }
$size = @getimagesize( $this->file ); $size = @getimagesize( $this->file );
if ( ! $size ) { if ( ! $size ) {
return new WP_Error( 'invalid_image', __( 'Could not read image size.' ), $this->file ); return new WP_Error( 'invalid_image', __( 'Could not read image size.' ), $this->file );
} }

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.6-alpha-49018'; $wp_version = '5.6-alpha-49019';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.