From affe1ab5ad19290d5fcc1d3e32d18e4ac0497a7b Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Mon, 12 Oct 2015 21:00:26 +0000 Subject: [PATCH] Media: avoid "divide by zero" in `wp_get_attachment_image_srcset_array()`. Fixes #34238. Built from https://develop.svn.wordpress.org/trunk@35081 git-svn-id: http://core.svn.wordpress.org/trunk@35046 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/media.php | 6 +++++- wp-includes/version.php | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/wp-includes/media.php b/wp-includes/media.php index 485903e9ac..799d63f473 100644 --- a/wp-includes/media.php +++ b/wp-includes/media.php @@ -921,7 +921,11 @@ function wp_get_attachment_image_srcset_array( $attachment_id, $size = 'medium' $candidate_url = path_join( dirname( $img_url ), $img['file'] ); // Calculate the new image ratio. - $img_ratio_compare = $img['height'] / $img['width']; + if ( $img['width'] ) { + $img_ratio_compare = $img['height'] / $img['width']; + } else { + $img_ratio_compare = 0; + } // If the new ratio differs by less than 0.01, use it. if ( abs( $img_ratio - $img_ratio_compare ) < 0.01 && ! in_array( $candidate_url, $candidates ) ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index 0321aeebd7..25ee5201a4 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-35080'; +$wp_version = '4.4-alpha-35081'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.