Changeset 50146 for trunk/src/wp-includes/functions.php

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.

File:

• trunk/src/wp-includes/functions.php (modified) (2 diffs)

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 = wp_getimagesize( $file );
             $mime      = ( isset( $imagesize['mime'] ) ) ? $imagesize['mime'] : false;
         } else {
@@ -7867 +7867 @@
     return abs( (float) $expected - (float) $actual ) <= $precision;
 }
+
+/**
+ * Allows PHP's getimagesize() to be debuggable when necessary.
+ *
+ * @since 5.7.0
+ *
+ * @param string $filename The file path.
+ * @param array $imageinfo Extended image information, passed by reference.
+ * @return array|false Array of image information or false on failure.
+ */
+function wp_getimagesize( $filename, &$imageinfo = array() ) {
+    if (
+        // Skip when running unit tests.
+        ! defined( 'DIR_TESTDATA' )
+        &&
+        // Return without silencing errors when in debug mode.
+        defined( 'WP_DEBUG' ) && WP_DEBUG
+    ) {
+        return getimagesize( $filename, $imageinfo );
+    }
+
+    /**
+     * Silencing notice and warning is intentional.
+     *
+     * getimagesize() has a tendency to generate errors, such as "corrupt JPEG data: 7191 extraneous bytes before
+     * marker", even when it's able to provide image size information.
+     *
+     * See https://core.trac.wordpress.org/ticket/42480
+     *
+     * phpcs:ignore WordPress.PHP.NoSilencedErrors
+     */
+    return @getimagesize( $filename, $imageinfo );
+}