Ticket #6821: 6821.check-errors.diff

wp-admin/includes/image-edit.php

@@ -568 +568 @@
         $post = get_post( $post_id );
 
         $img = WP_Image_Editor::get_instance( _load_image_to_edit_path( $post_id, 'full' ) );
-        if ( !$img ) {
+        if ( is_wp_error( $img ) ) {
                 $return->error = esc_js( __('Unable to create new image.') );
                 return $return;
         }

wp-admin/includes/image.php

@@ -33 +33 @@
         }
 
         $editor = WP_Image_Editor::get_instance( $src_file );
-        $src = $editor->crop( $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs );
+        if ( is_wp_error( $editor ) )
+                return $editor;
 
+        $src = $editor->crop( $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs );
         if ( is_wp_error( $src ) )
                 return $src;
 
@@ -94 +96 @@
                 $sizes = apply_filters( 'intermediate_image_sizes_advanced', $sizes );
 
                 $editor = WP_Image_Editor::get_instance( $file );
-                $metadata['sizes'] = $editor->multi_resize( $sizes );
+
+                if( ! is_wp_error( $editor ) ) {
+                        $metadata['sizes'] = $editor->multi_resize( $sizes );
+                }
 
                 // fetch additional metadata from exif/iptc
                 $image_meta = wp_read_image_metadata( $file );

wp-includes/media.php

@@ -383 +383 @@
         if ( $width || $height ) {
                 $editor = WP_Image_Editor::get_instance( $file );
 
-                if ( is_wp_error( $editor->resize( $width, $height, $crop ) ) );
+                if ( is_wp_error( $editor ) || is_wp_error( $editor->resize( $width, $height, $crop ) ) );
                         return false;
 
                 $resized_file = $editor->save();