Changeset 22192

Timestamp:

10/11/2012 06:59:41 PM (14 years ago)

Author:

ryan

Message:

Check for WP_Error return from WP_Image_Editor::get_instance().

Props markoheijnen
see #6821

Location:

trunk

Files:

• wp-admin/includes/image-edit.php (modified) (1 diff)
• wp-admin/includes/image.php (modified) (2 diffs)
• wp-includes/media.php (modified) (1 diff)

trunk/wp-admin/includes/image-edit.php

@@ -569 +569 @@
 
         $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;

trunk/wp-admin/includes/image.php

@@ -34 +34 @@
 
         $editor = WP_Image_Editor::get_instance( $src_file );
+        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;
@@ -95 +97 @@
 
                 $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

trunk/wp-includes/media.php

@@ -384 +384 @@
                 $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;