<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[50146] trunk/src: Media: Avoid suppressing errors when using `getimagesize()`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/50146">50146</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/50146","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>antpb</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-02-02 16:51:17 +0000 (Tue, 02 Feb 2021)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/ticket/49889">#49889</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesclasscustomimageheaderphp">trunk/src/wp-admin/includes/class-custom-image-header.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpsiteiconphp">trunk/src/wp-admin/includes/class-wp-site-icon.php</a></li>
<li><a href="#trunksrcwpadminincludesimagephp">trunk/src/wp-admin/includes/image.php</a></li>
<li><a href="#trunksrcwpincludesclasswpimageeditorgdphp">trunk/src/wp-includes/class-wp-image-editor-gd.php</a></li>
<li><a href="#trunksrcwpincludesdeprecatedphp">trunk/src/wp-includes/deprecated.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2021-02-02 16:42:17 UTC (rev 50145)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2021-02-02 16:51:17 UTC (rev 50146)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3927,7 +3927,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_url = wp_get_attachment_url( $attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $url = str_replace( wp_basename( $parent_url ), wp_basename( $cropped ), $parent_url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $size = @getimagesize( $cropped );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $size = wp_getimagesize( $cropped );
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_type = ( $size ) ? $size['mime'] : 'image/jpeg';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $object = array(
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasscustomimageheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-custom-image-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-custom-image-header.php 2021-02-02 16:42:17 UTC (rev 50145)
+++ trunk/src/wp-admin/includes/class-custom-image-header.php 2021-02-02 16:51:17 UTC (rev 50146)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -791,7 +791,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( file_exists( $file ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- list( $width, $height, $type, $attr ) = @getimagesize( $file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ list( $width, $height, $type, $attr ) = wp_getimagesize( $file );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $data = wp_get_attachment_metadata( $attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $height = isset( $data['height'] ) ? $data['height'] : 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1223,7 +1223,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_url = wp_get_attachment_url( $parent->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> $url = str_replace( wp_basename( $parent_url ), wp_basename( $cropped ), $parent_url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $size = @getimagesize( $cropped );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $size = wp_getimagesize( $cropped );
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_type = ( $size ) ? $size['mime'] : 'image/jpeg';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $object = array(
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpsiteiconphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-site-icon.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-site-icon.php 2021-02-02 16:42:17 UTC (rev 50145)
+++ trunk/src/wp-admin/includes/class-wp-site-icon.php 2021-02-02 16:51:17 UTC (rev 50146)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,7 +87,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_url = wp_get_attachment_url( $parent->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> $url = str_replace( wp_basename( $parent_url ), wp_basename( $cropped ), $parent_url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $size = @getimagesize( $cropped );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $size = wp_getimagesize( $cropped );
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_type = ( $size ) ? $size['mime'] : 'image/jpeg';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $object = array(
</span></span></pre></div>
<a id="trunksrcwpadminincludesimagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/image.php 2021-02-02 16:42:17 UTC (rev 50145)
+++ trunk/src/wp-admin/includes/image.php 2021-02-02 16:51:17 UTC (rev 50146)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +93,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Use the originally uploaded image dimensions as full_width and full_height.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $image_meta['original_image'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $image_file = wp_get_original_image_path( $attachment_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $imagesize = @getimagesize( $image_file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $imagesize = wp_getimagesize( $image_file );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $imagesize ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,7 +224,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array The image attachment meta data.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_create_image_subsizes( $file, $attachment_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $imagesize = @getimagesize( $file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $imagesize = wp_getimagesize( $file );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $imagesize ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // File is not an image.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -687,7 +687,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- list( , , $image_type ) = @getimagesize( $file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ list( , , $image_type ) = wp_getimagesize( $file );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * EXIF contains a bunch of data we'll probably never need formatted in ways
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -716,10 +716,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * as caption, description etc.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_callable( 'iptcparse' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- @getimagesize( $file, $info );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_getimagesize( $file, $info );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $info['APP13'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $iptc = @iptcparse( $info['APP13'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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'] );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Headline, "A brief synopsis of the caption".
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $iptc['2#105'][0] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -779,7 +790,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $exif_image_types = apply_filters( 'wp_read_image_metadata_types', array( IMAGETYPE_JPEG, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_callable( 'exif_read_data' ) && in_array( $image_type, $exif_image_types, true ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $exif = @exif_read_data( $file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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 );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $exif['ImageDescription'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> mbstring_binary_safe_encoding();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -877,7 +899,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if valid image, false if not valid image.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function file_is_valid_image( $path ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $size = @getimagesize( $path );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $size = wp_getimagesize( $path );
</ins><span class="cx" style="display: block; padding: 0 10px"> return ! empty( $size );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -892,7 +914,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function file_is_displayable_image( $path ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $displayable_image_types = array( IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_BMP, IMAGETYPE_ICO );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $info = @getimagesize( $path );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $info = wp_getimagesize( $path );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $info ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $result = false;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! in_array( $info[2], $displayable_image_types, true ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpimageeditorgdphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-image-editor-gd.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-image-editor-gd.php 2021-02-02 16:42:17 UTC (rev 50145)
+++ trunk/src/wp-includes/class-wp-image-editor-gd.php 2021-02-02 16:51:17 UTC (rev 50146)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,7 +105,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'invalid_image', __( 'File is not an image.' ), $this->file );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $size = @getimagesize( $this->file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $size = wp_getimagesize( $this->file );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $size ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'invalid_image', __( 'Could not read image size.' ), $this->file );
</span></span></pre></div>
<a id="trunksrcwpincludesdeprecatedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/deprecated.php 2021-02-02 16:42:17 UTC (rev 50145)
+++ trunk/src/wp-includes/deprecated.php 2021-02-02 16:51:17 UTC (rev 50146)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1948,7 +1948,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Do we need to constrain the image?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ($max_dims = apply_filters('attachment_max_dims', $max_dims)) && file_exists($src_file) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $imagesize = @getimagesize($src_file);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $imagesize = wp_getimagesize($src_file);
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if (($imagesize[0] > $max_dims[0]) || $imagesize[1] > $max_dims[1] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $actual_aspect = $imagesize[0] / $imagesize[1];
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2021-02-02 16:42:17 UTC (rev 50145)
+++ trunk/src/wp-includes/functions.php 2021-02-02 16:51:17 UTC (rev 50146)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3052,7 +3052,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $imagetype = exif_imagetype( $file );
</span><span class="cx" style="display: block; padding: 0 10px"> $mime = ( $imagetype ) ? image_type_to_mime_type( $imagetype ) : false;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( function_exists( 'getimagesize' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $imagesize = @getimagesize( $file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $imagesize = wp_getimagesize( $file );
</ins><span class="cx" style="display: block; padding: 0 10px"> $mime = ( isset( $imagesize['mime'] ) ) ? $imagesize['mime'] : false;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $mime = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7866,3 +7866,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_fuzzy_number_match( $expected, $actual, $precision = 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return abs( (float) $expected - (float) $actual ) <= $precision;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * 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 );
+}
</ins></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media.php 2021-02-02 16:42:17 UTC (rev 50145)
+++ trunk/src/wp-includes/media.php 2021-02-02 16:51:17 UTC (rev 50146)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,7 +244,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $info = null;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $thumb_file ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $info = @getimagesize( $thumb_file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $info = wp_getimagesize( $thumb_file );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $thumb_file && $info ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -962,7 +962,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/media' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $src_file = $icon_dir . '/' . wp_basename( $src );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- list( $width, $height ) = @getimagesize( $src_file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ list( $width, $height ) = wp_getimagesize( $src_file );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>