Changeset 51901 for trunk/src/wp-includes/ID3/module.tag.id3v2.php

Timestamp:

10/10/2021 01:15:16 AM (4 years ago)

Author:

SergeyBiryukov

Message:

External Libraries: Revert [51900] for now to investigate test failures.

See #54162.

File:

• trunk/src/wp-includes/ID3/module.tag.id3v2.php (modified) (7 diffs)

trunk/src/wp-includes/ID3/module.tag.id3v2.php

@@ -346 +346 @@
                 if (($frame_size <= strlen($framedata)) && ($this->IsValidID3v2FrameName($frame_name, $id3v2_majorversion))) {
 
-                    $parsedFrame                    = array();
+                    unset($parsedFrame);
                     $parsedFrame['frame_name']      = $frame_name;
                     $parsedFrame['frame_flags_raw'] = $frame_flags;
@@ -979 +979 @@
 
         } elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'USLT')) || // 4.8   USLT Unsynchronised lyric/text transcription
-                (($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'ULT'))) {    // 4.9   ULT  Unsynchronised lyric/text transcription
+                (($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'ULT'))) {     // 4.9   ULT  Unsynchronised lyric/text transcription
             //   There may be more than one 'Unsynchronised lyrics/text transcription' frame
             //   in each tag, but only one with the same language and content descriptor.
@@ -995 +995 @@
                 $frame_textencoding_terminator = "\x00";
             }
-            if (strlen($parsedFrame['data']) >= (4 + strlen($frame_textencoding_terminator))) {  // shouldn't be an issue but badly-written files have been spotted in the wild with not only no contents but also missing the required language field, see https://github.com/JamesHeinrich/getID3/issues/315
-                $frame_language = substr($parsedFrame['data'], $frame_offset, 3);
-                $frame_offset += 3;
-                $frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
-                if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
-                    $frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
-                }
-                $parsedFrame['description'] = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-                $parsedFrame['description'] = $this->MakeUTF16emptyStringEmpty($parsedFrame['description']);
-                $parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator));
-                $parsedFrame['data'] = $this->RemoveStringTerminator($parsedFrame['data'], $frame_textencoding_terminator);
-
-                $parsedFrame['encodingid']   = $frame_textencoding;
-                $parsedFrame['encoding']     = $this->TextEncodingNameLookup($frame_textencoding);
-
-                $parsedFrame['language']     = $frame_language;
-                $parsedFrame['languagename'] = $this->LanguageLookup($frame_language, false);
-                if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
-                    $info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']);
-                }
-            } else {
-                $this->warning('Invalid data in frame "'.$parsedFrame['frame_name'].'" at offset '.$parsedFrame['dataoffset']);
+            $frame_language = substr($parsedFrame['data'], $frame_offset, 3);
+            $frame_offset += 3;
+            $frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
+            if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
+                $frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
+            }
+            $parsedFrame['description'] = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
+            $parsedFrame['description'] = $this->MakeUTF16emptyStringEmpty($parsedFrame['description']);
+            $parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator));
+            $parsedFrame['data'] = $this->RemoveStringTerminator($parsedFrame['data'], $frame_textencoding_terminator);
+
+            $parsedFrame['encodingid']   = $frame_textencoding;
+            $parsedFrame['encoding']     = $this->TextEncodingNameLookup($frame_textencoding);
+
+            $parsedFrame['language']     = $frame_language;
+            $parsedFrame['languagename'] = $this->LanguageLookup($frame_language, false);
+            if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
+                $info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']);
             }
             unset($parsedFrame['data']);
@@ -1375 +1371 @@
             }
 
-            $frame_imagetype = null;
-            $frame_mimetype = null;
             if ($id3v2_majorversion == 2 && strlen($parsedFrame['data']) > $frame_offset) {
                 $frame_imagetype = substr($parsedFrame['data'], $frame_offset, 3);
@@ -1963 +1957 @@
             $parsedFrame['peakamplitude'] = getid3_lib::BigEndian2Float(substr($parsedFrame['data'], $frame_offset, 4));
             $frame_offset += 4;
-            foreach (array('track','album') as $rgad_entry_type) {
-                $rg_adjustment_word = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 2));
-                $frame_offset += 2;
-                $parsedFrame['raw'][$rgad_entry_type]['name']       = ($rg_adjustment_word & 0xE000) >> 13;
-                $parsedFrame['raw'][$rgad_entry_type]['originator'] = ($rg_adjustment_word & 0x1C00) >> 10;
-                $parsedFrame['raw'][$rgad_entry_type]['signbit']    = ($rg_adjustment_word & 0x0200) >>  9;
-                $parsedFrame['raw'][$rgad_entry_type]['adjustment'] = ($rg_adjustment_word & 0x0100);
-            }
+            $rg_track_adjustment = getid3_lib::Dec2Bin(substr($parsedFrame['data'], $frame_offset, 2));
+            $frame_offset += 2;
+            $rg_album_adjustment = getid3_lib::Dec2Bin(substr($parsedFrame['data'], $frame_offset, 2));
+            $frame_offset += 2;
+            $parsedFrame['raw']['track']['name']       = getid3_lib::Bin2Dec(substr($rg_track_adjustment, 0, 3));
+            $parsedFrame['raw']['track']['originator'] = getid3_lib::Bin2Dec(substr($rg_track_adjustment, 3, 3));
+            $parsedFrame['raw']['track']['signbit']    = getid3_lib::Bin2Dec(substr($rg_track_adjustment, 6, 1));
+            $parsedFrame['raw']['track']['adjustment'] = getid3_lib::Bin2Dec(substr($rg_track_adjustment, 7, 9));
+            $parsedFrame['raw']['album']['name']       = getid3_lib::Bin2Dec(substr($rg_album_adjustment, 0, 3));
+            $parsedFrame['raw']['album']['originator'] = getid3_lib::Bin2Dec(substr($rg_album_adjustment, 3, 3));
+            $parsedFrame['raw']['album']['signbit']    = getid3_lib::Bin2Dec(substr($rg_album_adjustment, 6, 1));
+            $parsedFrame['raw']['album']['adjustment'] = getid3_lib::Bin2Dec(substr($rg_album_adjustment, 7, 9));
             $parsedFrame['track']['name']       = getid3_lib::RGADnameLookup($parsedFrame['raw']['track']['name']);
             $parsedFrame['track']['originator'] = getid3_lib::RGADoriginatorLookup($parsedFrame['raw']['track']['originator']);
@@ -2447 +2445 @@
             TND Dinars
             TOP Pa'anga
-            TRL Liras (old)
-            TRY Liras
+            TRL Liras
             TTD Dollars
             TVD Tuvalu Dollars
@@ -2649 +2646 @@
             TOP Tonga
             TRL Turkey
-            TRY Turkey
             TTD Trinidad and Tobago
             TVD Tuvalu