Changeset 58050 for branches/6.5

Timestamp:

04/26/2024 03:25:54 PM (5 months ago)

Author:

adamsilverstein

Message:

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

Import upstream fix from libavifinfo, correcting a potential fatal error.

Reviewed by jorbin.
Merges [58049] to the 6.5 branch.

Props yguyon.
Fixes #60980.

Location:

branches/6.5

Files:

• . (modified) (1 prop)
• src/wp-includes/class-avif-info.php (modified) (1 diff)
• tests/phpunit/data/images/avif-alpha-grid2x1.avif (copied) (copied from trunk/tests/phpunit/data/images/avif-alpha-grid2x1.avif)
• tests/phpunit/tests/functions.php (modified) (1 diff)
• tests/phpunit/tests/image/editor.php (modified) (1 diff)

branches/6.5/src/wp-includes/class-avif-info.php

@@ -176 +176 @@
           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;

branches/6.5/tests/phpunit/tests/functions.php

@@ -1523 +1523 @@
                     IMAGETYPE_AVIF,
                     'width="128" height="128"',
+                    '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',
                 ),

branches/6.5/tests/phpunit/tests/image/editor.php

@@ -449 +449 @@
             ),
             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(