Media: fix potential error in class-avif-info.php::get_item_features().

Import upstream fix from libavifinfo, correcting a potential fatal error. Props yguyon. Fixes #60980. git-svn-id: https://develop.svn.wordpress.org/trunk@58049 602fd350-edb4-49c9-b593-d223f7449a82
anton-vlasenko · Apr 26, 2024 · 2074392 · 2074392
1 parent 7de15eb
commit 2074392
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/src/wp-includes/class-avif-info.php b/src/wp-includes/class-avif-info.php
@@ -175,7 +175,7 @@ private function get_item_features( $target_item_id, $tile_depth ) {
         if ( $tile->parent_item_id != $target_item_id ) {
           continue;
         }
-        $status = get_item_features( $tile->tile_item_id, $tile_depth + 1 );
+        $status = $this->get_item_features( $tile->tile_item_id, $tile_depth + 1 );
         if ( $status != NOT_FOUND ) {
           return $status;
         }

diff --git a/tests/phpunit/data/images/avif-alpha-grid2x1.avif b/tests/phpunit/data/images/avif-alpha-grid2x1.avif
diff --git a/tests/phpunit/tests/functions.php b/tests/phpunit/tests/functions.php
@@ -1525,6 +1525,17 @@ public function data_wp_getimagesize() {
 					'mime' => 'image/avif',
 				),
 			),
+			// Grid AVIF.
+			array(
+				DIR_TESTDATA . '/images/avif-alpha-grid2x1.avif',
+				array(
+					199,
+					200,
+					IMAGETYPE_AVIF,
+					'width="199" height="200"',
+					'mime' => 'image/avif',
+				),
+			),
 		);
 
 		return $data;

diff --git a/tests/phpunit/tests/image/editor.php b/tests/phpunit/tests/image/editor.php
@@ -447,6 +447,15 @@ public function data_wp_get_avif_info() {
 					'num_channels' => 4,
 				),
 			),
+			array(
+				DIR_TESTDATA . '/images/avif-alpha-grid2x1.avif',
+				array(
+					'width'        => 199,
+					'height'       => 200,
+					'bit_depth'    => 8,
+					'num_channels' => 4,
+				),
+			),
 			array(
 				DIR_TESTDATA . '/images/colors_hdr_p3.avif',
 				array(