Changeset 50822

Timestamp:

05/07/2021 09:31:01 AM (3 years ago)

Author:

SergeyBiryukov

Message:

Media: Avoid an infinite loop between wp_getimagesize() and wp_get_image_mime().

As a result of the recent changes, both functions were calling each other if the exif PHP extension is not available.

The issue is now resolved by calling the getimagesize() PHP function directly, instead of the wp_getimagesize() wrapper.

Follow-up to [50146], [50810], [50814], [50815], [50818-50821].

See #35725.

File:

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

trunk/src/wp-includes/functions.php

@@ -3045 +3045 @@
  *
  * @since 4.7.1
+ * @since 5.8.0 Added support for WebP images.
  *
  * @param string $file Full path to the file.
@@ -3060 +3061 @@
             $mime      = ( $imagetype ) ? image_type_to_mime_type( $imagetype ) : false;
         } elseif ( function_exists( 'getimagesize' ) ) {
-            $imagesize = wp_getimagesize( $file );
-            $mime      = ( isset( $imagesize['mime'] ) ) ? $imagesize['mime'] : false;
+            // Don't silence errors when in debug mode, unless running unit tests.
+            if ( defined( 'WP_DEBUG' ) && WP_DEBUG
+                && ! defined( 'WP_RUN_CORE_TESTS' )
+            ) {
+                // Not using wp_getimagesize() here to avoid an infinite loop.
+                $imagesize = getimagesize( $file );
+            } else {
+                // phpcs:ignore WordPress.PHP.NoSilencedErrors
+                $imagesize = @getimagesize( $file );
+            }
+
+            $mime = ( isset( $imagesize['mime'] ) ) ? $imagesize['mime'] : false;
         } else {
             $mime = false;