Changeset 54376 for trunk/src/wp-includes/ID3/module.audio-video.riff.php

Timestamp:

10/04/2022 02:06:29 AM (2 years ago)

Author:

desrosj

Message:

External Libraries: Update getID3 to version 1.9.22.

This updates the getID3 library from version 1.9.21 to 1.9.22, which contains a number of bug fixes and improvements to PHP 8.1 support.

A full list of changes can be found on GitHub: ​https://github.com/JamesHeinrich/getID3/compare/v1.9.21...v1.9.22.

Props jrf, desrosj.
Fixes #56692.

File:

• trunk/src/wp-includes/ID3/module.audio-video.riff.php (modified) (4 diffs)

trunk/src/wp-includes/ID3/module.audio-video.riff.php

@@ -809 +809 @@
                                     $strfData = $thisfile_riff['AVI ']['hdrl']['strl']['strf'][$i]['data'];
 
+                                    if (!isset($thisfile_riff_raw['strf'][$strhfccType][$streamindex])) {
+                                        $thisfile_riff_raw['strf'][$strhfccType][$streamindex] = null;
+                                    }
                                     // shortcut
                                     $thisfile_riff_raw_strf_strhfccType_streamindex = &$thisfile_riff_raw['strf'][$strhfccType][$streamindex];
@@ -1354 +1357 @@
             $info['playtime_seconds'] = 0;
         }
-        if (isset($thisfile_riff_raw['strh'][0]['dwLength']) && isset($thisfile_riff_raw['avih']['dwMicroSecPerFrame'])) {
+        if (isset($thisfile_riff_raw['strh'][0]['dwLength']) && isset($thisfile_riff_raw['avih']['dwMicroSecPerFrame'])) { // @phpstan-ignore-line
             // needed for >2GB AVIs where 'avih' chunk only lists number of frames in that chunk, not entire movie
             $info['playtime_seconds'] = $thisfile_riff_raw['strh'][0]['dwLength'] * ($thisfile_riff_raw['avih']['dwMicroSecPerFrame'] / 1000000);
-        } elseif (isset($thisfile_riff_raw['avih']['dwTotalFrames']) && isset($thisfile_riff_raw['avih']['dwMicroSecPerFrame'])) {
+        } elseif (isset($thisfile_riff_raw['avih']['dwTotalFrames']) && isset($thisfile_riff_raw['avih']['dwMicroSecPerFrame'])) { // @phpstan-ignore-line
             $info['playtime_seconds'] = $thisfile_riff_raw['avih']['dwTotalFrames'] * ($thisfile_riff_raw['avih']['dwMicroSecPerFrame'] / 1000000);
         }
@@ -1580 +1583 @@
         $info = &$this->getid3->info;
 
-        $RIFFchunk = false;
+        $RIFFchunk = array();
         $FoundAllChunksWeNeed = false;
         $LISTchunkParent = null;
@@ -1935 +1938 @@
         }
 
-        return $RIFFchunk;
+        return !empty($RIFFchunk) ? $RIFFchunk : false;
     }