Changeset 56975 for trunk/src/wp-includes/ID3/module.audio.mp3.php

Timestamp:

10/20/2023 01:27:56 PM (3 years ago)

Author:

SergeyBiryukov

Message:

External Libraries: Update getID3 to version 1.9.23.

The latest version includes numerous bug fixes, a few new features, as well as various improvements for PHP 8.1 and PHP 8.2 support.

This commit also includes PHPCS adjustments previously made for a passing PHP Compatibility scan.

References:

• ​getID3 1.9.23 release notes
• ​Full list of changes in getID3 1.9.23

Follow-up to [47601], [48278], [52254], [54376].

Props jrf.
Fixes #59683.

File:

• trunk/src/wp-includes/ID3/module.audio.mp3.php (modified) (5 diffs)

trunk/src/wp-includes/ID3/module.audio.mp3.php

@@ -1381 +1381 @@
                                                         $Distribution['frequency'][$LongMPEGfrequencyLookup[$head4]] = isset($Distribution['frequency'][$LongMPEGfrequencyLookup[$head4]]) ? ++$Distribution['frequency'][$LongMPEGfrequencyLookup[$head4]] : 1;
                                                         if (++$frames_scanned >= $max_frames_scan) {
-                                                                $pct_data_scanned = ($this->ftell() - $info['avdataoffset']) / ($info['avdataend'] - $info['avdataoffset']);
+                                                                $pct_data_scanned = getid3_lib::SafeDiv($this->ftell() - $info['avdataoffset'], $info['avdataend'] - $info['avdataoffset']);
                                                                 $this->warning('too many MPEG audio frames to scan, only scanned first '.$max_frames_scan.' frames ('.number_format($pct_data_scanned * 100, 1).'% of file) and extrapolated distribution, playtime and bitrate may be incorrect.');
                                                                 foreach ($Distribution as $key1 => $value1) {
                                                                         foreach ($value1 as $key2 => $value2) {
-                                                                                $Distribution[$key1][$key2] = round($value2 / $pct_data_scanned);
+                                                                                $Distribution[$key1][$key2] = $pct_data_scanned ? round($value2 / $pct_data_scanned) : 1;
                                                                         }
                                                                 }
@@ -1476 +1476 @@
                 $FirstFrameThisfileInfo = null;
                 while ($SynchSeekOffset < $sync_seek_buffer_size) {
-                        if ((($avdataoffset + $SynchSeekOffset)  < $info['avdataend']) && !feof($this->getid3->fp)) {
+                        if ((($avdataoffset + $SynchSeekOffset)  < $info['avdataend']) && !$this->feof()) {
 
                                 if ($SynchSeekOffset > $sync_seek_buffer_size) {
@@ -1488 +1488 @@
                                         }
                                         if (empty($info['mpeg'])) {
-                                                unset($info['mpeg']);
-                                        }
-                                        return false;
-
-                                } elseif (feof($this->getid3->fp)) {
-
-                                        $this->error('Could not find valid MPEG audio synch before end of file');
-                                        if (isset($info['audio']['bitrate'])) {
-                                                unset($info['audio']['bitrate']);
-                                        }
-                                        if (isset($info['mpeg']['audio'])) {
-                                                unset($info['mpeg']['audio']);
-                                        }
-                                        if (isset($info['mpeg']) && (!is_array($info['mpeg']) || (count($info['mpeg']) == 0))) {
                                                 unset($info['mpeg']);
                                         }
@@ -1653 +1639 @@
                                                                 $frames_scanned++;
                                                                 if ($frames_scan_per_segment && (++$frames_scanned_this_segment >= $frames_scan_per_segment)) {
-                                                                        $this_pct_scanned = ($this->ftell() - $scan_start_offset[$current_segment]) / ($info['avdataend'] - $info['avdataoffset']);
+                                                                        $this_pct_scanned = getid3_lib::SafeDiv($this->ftell() - $scan_start_offset[$current_segment], $info['avdataend'] - $info['avdataoffset']);
                                                                         if (($current_segment == 0) && (($this_pct_scanned * $max_scan_segments) >= 1)) {
                                                                                 // file likely contains < $max_frames_scan, just scan as one segment
@@ -1744 +1730 @@
                 }
                 $info['audio']['channels']        = $info['mpeg']['audio']['channels'];
+                if ($info['audio']['channels'] < 1) {
+                        $this->error('Corrupt MP3 file: no channels');
+                        return false;
+                }
                 $info['audio']['channelmode']     = $info['mpeg']['audio']['channelmode'];
                 $info['audio']['sample_rate']     = $info['mpeg']['audio']['sample_rate'];