Changeset 52254 for trunk/src/wp-includes/ID3/module.audio.ogg.php

Timestamp:

11/26/2021 03:04:10 AM (3 years ago)

Author:

SergeyBiryukov

Message:

External Libraries: Update getID3 to version 1.9.21.

The latest version includes preliminary PHP 8.1 support, as well as a variety of bug fixes.

Release notes: ​https://github.com/JamesHeinrich/getID3/releases/tag/v1.9.21

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

This commit also includes:

• Setting the $options_audiovideo_quicktime_ReturnAtomData property (now false by default) to true in wp_read_video_metadata() and wp_read_audio_metadata() in order to get the created_timestamp value.
• PHPCS adjustments previously made for a passing PHP Compatibility scan.

Follow-up to [47601], [47737], [47902], [48278], [49621], [50714].

Props jrf, SergeyBiryukov.
Fixes #54162.

File:

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

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

@@ -530 +530 @@
     public function ParseOggPageHeader() {
         // http://xiph.org/ogg/vorbis/doc/framing.html
+        $oggheader = array();
         $oggheader['page_start_offset'] = $this->ftell(); // where we started from in the file
 
@@ -681 +682 @@
                 $VorbisCommentPage++;
 
-                $oggpageinfo = $this->ParseOggPageHeader();
-                $info['ogg']['pageheader'][$oggpageinfo['page_seqno']] = $oggpageinfo;
-
-                // First, save what we haven't read yet
-                $AsYetUnusedData = substr($commentdata, $commentdataoffset);
-
-                // Then take that data off the end
-                $commentdata     = substr($commentdata, 0, $commentdataoffset);
-
-                // Add [headerlength] bytes of dummy data for the Ogg Page Header, just to keep absolute offsets correct
-                $commentdata .= str_repeat("\x00", 27 + $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_segments']);
-                $commentdataoffset += (27 + $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_segments']);
-
-                // Finally, stick the unused data back on the end
-                $commentdata .= $AsYetUnusedData;
-
-                //$commentdata .= $this->fread($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']);
-                if (!isset($info['ogg']['pageheader'][$VorbisCommentPage])) {
-                    $this->warning('undefined Vorbis Comment page "'.$VorbisCommentPage.'" at offset '.$this->ftell());
+                if ($oggpageinfo = $this->ParseOggPageHeader()) {
+                    $info['ogg']['pageheader'][$oggpageinfo['page_seqno']] = $oggpageinfo;
+
+                    // First, save what we haven't read yet
+                    $AsYetUnusedData = substr($commentdata, $commentdataoffset);
+
+                    // Then take that data off the end
+                    $commentdata     = substr($commentdata, 0, $commentdataoffset);
+
+                    // Add [headerlength] bytes of dummy data for the Ogg Page Header, just to keep absolute offsets correct
+                    $commentdata .= str_repeat("\x00", 27 + $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_segments']);
+                    $commentdataoffset += (27 + $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_segments']);
+
+                    // Finally, stick the unused data back on the end
+                    $commentdata .= $AsYetUnusedData;
+
+                    //$commentdata .= $this->fread($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']);
+                    if (!isset($info['ogg']['pageheader'][$VorbisCommentPage])) {
+                        $this->warning('undefined Vorbis Comment page "'.$VorbisCommentPage.'" at offset '.$this->ftell());
+                        break;
+                    }
+                    $readlength = self::OggPageSegmentLength($info['ogg']['pageheader'][$VorbisCommentPage], 1);
+                    if ($readlength <= 0) {
+                        $this->warning('invalid length Vorbis Comment page "'.$VorbisCommentPage.'" at offset '.$this->ftell());
+                        break;
+                    }
+                    $commentdata .= $this->fread($readlength);
+
+                    //$filebaseoffset += $oggpageinfo['header_end_offset'] - $oggpageinfo['page_start_offset'];
+                } else {
+                    $this->warning('failed to ParseOggPageHeader() at offset '.$this->ftell());
                     break;
                 }
-                $readlength = self::OggPageSegmentLength($info['ogg']['pageheader'][$VorbisCommentPage], 1);
-                if ($readlength <= 0) {
-                    $this->warning('invalid length Vorbis Comment page "'.$VorbisCommentPage.'" at offset '.$this->ftell());
-                    break;
-                }
-                $commentdata .= $this->fread($readlength);
-
-                //$filebaseoffset += $oggpageinfo['header_end_offset'] - $oggpageinfo['page_start_offset'];
             }
             $ThisFileInfo_ogg_comments_raw[$i]['offset'] = $commentdataoffset;