Media: Pass the appropriate reference into wp_getimagesize.

whyisjake · whyisjake · commit 140bd894d6b7 · 2021-03-18T23:59:12.000Z
With changes that were introduced in [49889] the second parameter for getimagesize() function is expecting a a reference. Previously, most calls did not pass the 2nd param, and as a result, we are getting unexpected results. This was only a problem with applications that are using a custom stream wrapper, and the image contained EXIF data. For more see: * humanmade/S3-Uploads#496 * aws/aws-sdk-php#1923 Fixes #52826. Props terriann, SergeyBiryukov, Mista-Flo, hellofromTonya, rinatkhaziev, whyisjake. git-svn-id: https://develop.svn.wordpress.org/trunk@50552 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/src/wp-admin/includes/image.php b/src/wp-admin/includes/image.php
@@ -711,6 +711,7 @@ function wp_read_image_metadata( $file ) {
 	);
 
 	$iptc = array();
+	$info = array();
 	/*
 	 * Read IPTC first, since it might contain data not available in exif such
 	 * as caption, description etc.
diff --git a/src/wp-includes/media.php b/src/wp-includes/media.php
@@ -4975,19 +4975,19 @@ function wp_show_heic_upload_error( $plupload_settings ) {
  *
  * @since 5.7.0
  *
- * @param string $filename  The file path.
- * @param array  $imageinfo Extended image information, passed by reference.
+ * @param string $filename   The file path.
+ * @param array  $image_info Optional. Extended image information (passed by reference).
  * @return array|false Array of image information or false on failure.
  */
-function wp_getimagesize( $filename, &$imageinfo = array() ) {
+function wp_getimagesize( $filename, array &$image_info = null ) {
 	if (
 		// Skip when running unit tests.
 		! defined( 'WP_RUN_CORE_TESTS' )
 		&&
 		// Return without silencing errors when in debug mode.
 		defined( 'WP_DEBUG' ) && WP_DEBUG
 	) {
-		return getimagesize( $filename, $imageinfo );
+		return getimagesize( $filename, $image_info );
 	}
 
 	/*
@@ -5001,5 +5001,5 @@ function wp_getimagesize( $filename, &$imageinfo = array() ) {
 	 *
 	 * phpcs:ignore WordPress.PHP.NoSilencedErrors
 	 */
-	return @getimagesize( $filename, $imageinfo );
+	return @getimagesize( $filename, $image_info );
 }

Original file line number	Diff line number	Diff line change
`@@ -4975,19 +4975,19 @@ function wp_show_heic_upload_error( $plupload_settings ) {`
`4975`	`4975`	`*`
`4976`	`4976`	`* @since 5.7.0`
`4977`	`4977`	`*`
`4978`		`- * @param string $filename The file path.`
`4979`		`- * @param array $imageinfo Extended image information, passed by reference.`
	`4978`	`+ * @param string $filename The file path.`
	`4979`	`+ * @param array $image_info Optional. Extended image information (passed by reference).`
`4980`	`4980`	`* @return array\|false Array of image information or false on failure.`
`4981`	`4981`	`*/`
`4982`		`-function wp_getimagesize( $filename, &$imageinfo = array() ) {`
	`4982`	`+function wp_getimagesize( $filename, array &$image_info = null ) {`
`4983`	`4983`	`if (`
`4984`	`4984`	`// Skip when running unit tests.`
`4985`	`4985`	`! defined( 'WP_RUN_CORE_TESTS' )`
`4986`	`4986`	`&&`
`4987`	`4987`	`// Return without silencing errors when in debug mode.`
`4988`	`4988`	`defined( 'WP_DEBUG' ) && WP_DEBUG`
`4989`	`4989`	`) {`
`4990`		`- return getimagesize( $filename, $imageinfo );`
	`4990`	`+ return getimagesize( $filename, $image_info );`
`4991`	`4991`	`}`
`4992`	`4992`
`4993`	`4993`	`/*`
`@@ -5001,5 +5001,5 @@ function wp_getimagesize( $filename, &$imageinfo = array() ) {`
`5001`	`5001`	`*`
`5002`	`5002`	`* phpcs:ignore WordPress.PHP.NoSilencedErrors`
`5003`	`5003`	`*/`
`5004`		`- return @getimagesize( $filename, $imageinfo );`
	`5004`	`+ return @getimagesize( $filename, $image_info );`
`5005`	`5005`	`}`