Changeset 61289 for branches/6.9/src/wp-includes/ID3/module.tag.id3v2.php

Timestamp:

11/24/2025 06:36:59 PM (3 months ago)

Author:

SergeyBiryukov

Message:

External Libraries: Update getID3 to version 1.9.24.

In [60812], two changes related to PHP 8.5 compatibility were cherry picked from the upstream repository to be included in time for WordPress 6.9. Since then, a proper release has been tagged which includes several bug fixes in addition to the previous two changes.

HEIF support has also been added to the Quicktime audio/video module.

A full list of changes can be found on GitHub: ​https://github.com/JamesHeinrich/getID3/releases/tag/v1.9.24

Reviewed by desrosj, SergeyBiryukov.
Merges [61253] to the 6.9 branch.

Props TobiasBg.
Fixes #64253.

Location:

branches/6.9

Files:

• . (modified) (1 prop)
• src/wp-includes/ID3/module.tag.id3v2.php (modified) (3 diffs)

branches/6.9/src/wp-includes/ID3/module.tag.id3v2.php

@@ -660 +660 @@
             // Identifier              <up to 64 bytes binary data>
             $exploded = explode("\x00", $parsedFrame['data'], 2);
-            $parsedFrame['ownerid'] = (isset($exploded[0]) ? $exploded[0] : '');
+            $parsedFrame['ownerid'] = $exploded[0];
             $parsedFrame['data']    = (isset($exploded[1]) ? $exploded[1] : '');
 
@@ -1069 +1069 @@
 
                     $frame_remainingdata = substr($frame_remainingdata, $frame_terminatorpos + strlen($frame_textencoding_terminator));
-                    if (($timestampindex == 0) && (ord($frame_remainingdata[0]) != 0)) {
-                        // timestamp probably omitted for first data item
-                    } else {
-                        $parsedFrame['lyrics'][$timestampindex]['timestamp'] = getid3_lib::BigEndian2Int(substr($frame_remainingdata, 0, 4));
-                        $frame_remainingdata = substr($frame_remainingdata, 4);
+                    if (strlen($frame_remainingdata)) { // https://github.com/JamesHeinrich/getID3/issues/444
+                        if (($timestampindex == 0) && (ord($frame_remainingdata[0]) != 0)) {
+                            // timestamp probably omitted for first data item
+                        } else {
+                            $parsedFrame['lyrics'][$timestampindex]['timestamp'] = getid3_lib::BigEndian2Int(substr($frame_remainingdata, 0, 4));
+                            $frame_remainingdata = substr($frame_remainingdata, 4);
+                        }
+                        $timestampindex++;
                     }
-                    $timestampindex++;
                 }
             }
@@ -1305 +1307 @@
 
             $frame_offset = 0;
-            $parsedFrame['adjustmentbits'] = substr($parsedFrame['data'], $frame_offset++, 1);
+            $parsedFrame['adjustmentbits'] = ord(substr($parsedFrame['data'], $frame_offset++, 1));
             $frame_adjustmentbytes = ceil($parsedFrame['adjustmentbits'] / 8);