Changeset 49019 for trunk/src/wp-includes/class-wp-image-editor-gd.php

Timestamp:

09/20/2020 02:26:38 PM (4 years ago)

Author:

SergeyBiryukov

Message:

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.

File:

• trunk/src/wp-includes/class-wp-image-editor-gd.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-image-editor-gd.php

@@ -94 +94 @@
         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 ) ) {
@@ -101 +107 @@
 
         $size = @getimagesize( $this->file );
+
         if ( ! $size ) {
             return new WP_Error( 'invalid_image', __( 'Could not read image size.' ), $this->file );