Changeset 50146

Timestamp:

02/02/2021 04:51:17 PM (4 years ago)

Author:

antpb

Message:

Media: Avoid suppressing errors when using getimagesize().

Previously, all logic utilizing getimagesize() was supressing errors making it difficult to debug usage of the function.

A new wp_getimagesize() function has been added to allow the errors to no longer be suppressed when WP_DEBUG is enabled.

Props Howdy_McGee, SergeyBiryukov, mukesh27, davidbaumwald, noisysocks, hellofromTonya.
Fixes #49889.

Location:

trunk/src

Files:

• wp-admin/includes/ajax-actions.php (modified) (1 diff)
• wp-admin/includes/class-custom-image-header.php (modified) (2 diffs)
• wp-admin/includes/class-wp-site-icon.php (modified) (1 diff)
• wp-admin/includes/image.php (modified) (7 diffs)
• wp-includes/class-wp-image-editor-gd.php (modified) (1 diff)
• wp-includes/deprecated.php (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)
• wp-includes/media.php (modified) (2 diffs)

trunk/src/wp-admin/includes/ajax-actions.php

@@ -3928 +3928 @@
             $url        = str_replace( wp_basename( $parent_url ), wp_basename( $cropped ), $parent_url );
 
-            $size       = @getimagesize( $cropped );
+            $size       = getimagesize( $cropped );
             $image_type = ( $size ) ? $size['mime'] : 'image/jpeg';
 

trunk/src/wp-admin/includes/class-custom-image-header.php

@@ -792 +792 @@
 
         if ( file_exists( $file ) ) {
-            list( $width, $height, $type, $attr ) = @getimagesize( $file );
+            list( $width, $height, $type, $attr ) = getimagesize( $file );
         } else {
             $data   = wp_get_attachment_metadata( $attachment_id );
@@ -1224 +1224 @@
         $url        = str_replace( wp_basename( $parent_url ), wp_basename( $cropped ), $parent_url );
 
-        $size       = @getimagesize( $cropped );
+        $size       = getimagesize( $cropped );
         $image_type = ( $size ) ? $size['mime'] : 'image/jpeg';
 

trunk/src/wp-admin/includes/class-wp-site-icon.php

@@ -88 +88 @@
         $url        = str_replace( wp_basename( $parent_url ), wp_basename( $cropped ), $parent_url );
 
-        $size       = @getimagesize( $cropped );
+        $size       = getimagesize( $cropped );
         $image_type = ( $size ) ? $size['mime'] : 'image/jpeg';
 

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

@@ -94 +94 @@
     if ( ! empty( $image_meta['original_image'] ) ) {
         $image_file = wp_get_original_image_path( $attachment_id );
-        $imagesize  = @getimagesize( $image_file );
+        $imagesize  = getimagesize( $image_file );
     }
 
@@ -225 +225 @@
  */
 function wp_create_image_subsizes( $file, $attachment_id ) {
-    $imagesize = @getimagesize( $file );
+    $imagesize = getimagesize( $file );
 
     if ( empty( $imagesize ) ) {
@@ -688 +688 @@
     }
 
-    list( , , $image_type ) = @getimagesize( $file );
+    list( , , $image_type ) = getimagesize( $file );
 
     /*
@@ -717 +717 @@
      */
     if ( is_callable( 'iptcparse' ) ) {
-        @getimagesize( $file, $info );
+        getimagesize( $file, $info );
 
         if ( ! empty( $info['APP13'] ) ) {
-            $iptc = @iptcparse( $info['APP13'] );
+            if (
+                // Skip when running unit tests.
+                ! defined( 'DIR_TESTDATA' )
+                &&
+                // Process without silencing errors when in debug mode.
+                defined( 'WP_DEBUG' ) && WP_DEBUG
+            ) {
+                $iptc = iptcparse( $info['APP13'] );
+            } else {
+                // phpcs:ignore WordPress.PHP.NoSilencedErrors -- Silencing notice and warning is intentional. See https://core.trac.wordpress.org/ticket/42480
+                $iptc = @iptcparse( $info['APP13'] );
+            }
 
             // Headline, "A brief synopsis of the caption".
@@ -780 +791 @@
 
     if ( is_callable( 'exif_read_data' ) && in_array( $image_type, $exif_image_types, true ) ) {
-        $exif = @exif_read_data( $file );
+        if (
+            // Skip when running unit tests.
+            ! defined( 'DIR_TESTDATA' )
+            &&
+            // Process without silencing errors when in debug mode.
+            defined( 'WP_DEBUG' ) && WP_DEBUG
+        ) {
+            $exif = exif_read_data( $file );
+        } else {
+            // phpcs:ignore WordPress.PHP.NoSilencedErrors -- Silencing notice and warning is intentional. See https://core.trac.wordpress.org/ticket/42480
+            $exif = @exif_read_data( $file );
+        }
 
         if ( ! empty( $exif['ImageDescription'] ) ) {
@@ -878 +900 @@
  */
 function file_is_valid_image( $path ) {
-    $size = @getimagesize( $path );
+    $size = getimagesize( $path );
     return ! empty( $size );
 }
@@ -893 +915 @@
     $displayable_image_types = array( IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_BMP, IMAGETYPE_ICO );
 
-    $info = @getimagesize( $path );
+    $info = getimagesize( $path );
     if ( empty( $info ) ) {
         $result = false;

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

@@ -106 +106 @@
         }
 
-        $size = @getimagesize( $this->file );
+        $size = getimagesize( $this->file );
 
         if ( ! $size ) {

trunk/src/wp-includes/deprecated.php

@@ -1949 +1949 @@
     if ( ($max_dims = apply_filters('attachment_max_dims', $max_dims)) && file_exists($src_file) ) {
 
-        $imagesize = @getimagesize($src_file);
+        $imagesize = getimagesize($src_file);
 
         if (($imagesize[0] > $max_dims[0]) || $imagesize[1] > $max_dims[1] ) {

trunk/src/wp-includes/functions.php

@@ -3053 +3053 @@
             $mime      = ( $imagetype ) ? image_type_to_mime_type( $imagetype ) : false;
         } elseif ( function_exists( 'getimagesize' ) ) {
-            $imagesize = @getimagesize( $file );
+            $imagesize = getimagesize( $file );
             $mime      = ( isset( $imagesize['mime'] ) ) ? $imagesize['mime'] : false;
         } else {
@@ -7867 +7867 @@
     return abs( (float) $expected - (float) $actual ) <= $precision;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/src/wp-includes/media.php

@@ -245 +245 @@
 
         if ( $thumb_file ) {
-            $info = @getimagesize( $thumb_file );
+            $info = getimagesize( $thumb_file );
         }
 
@@ -963 +963 @@
 
                 $src_file               = $icon_dir . '/' . wp_basename( $src );
-                list( $width, $height ) = @getimagesize( $src_file );
+                list( $width, $height ) = getimagesize( $src_file );
             }
         }