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

Timestamp:

11/17/2025 10:20:32 PM (3 months ago)

Author:

desrosj

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

Props TobiasBg.
Fixes #64253.

File:

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

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

@@ -68 +68 @@
         $RIFFsubtype = substr($RIFFheader, 8, 4);
 
+        if ($RIFFsize == "\x00\x00\x00\x00") {
+            // https://github.com/JamesHeinrich/getID3/issues/468
+            // may occur in streaming files where the data size is unknown
+            $thisfile_riff['header_size'] = $info['avdataend'] - 8;
+            $this->warning('RIFF size field is empty, assuming the correct value is filesize-8 ('.$thisfile_riff['header_size'].')');
+        } else {
+            $thisfile_riff['header_size'] = $this->EitherEndian2Int($RIFFsize);
+        }
+
         switch ($RIFFtype) {
-
             case 'FORM':  // AIFF, AIFC
                 //$info['fileformat']   = 'aiff';
                 $this->container = 'aiff';
-                $thisfile_riff['header_size'] = $this->EitherEndian2Int($RIFFsize);
                 $thisfile_riff[$RIFFsubtype]  = $this->ParseRIFF($offset, ($offset + $thisfile_riff['header_size'] - 4));
                 break;
@@ -82 +89 @@
                 //$info['fileformat']   = 'riff';
                 $this->container = 'riff';
-                $thisfile_riff['header_size'] = $this->EitherEndian2Int($RIFFsize);
                 if ($RIFFsubtype == 'RMP3') {
                     // RMP3 is identical to WAVE, just renamed. Used by [unknown program] when creating RIFF-MP3s
@@ -99 +105 @@
                 }
 
-                $nextRIFFoffset = $Original['avdataoffset'] + 8 + $thisfile_riff['header_size']; // 8 = "RIFF" + 32-bit offset
+                $nextRIFFoffset = (int) $Original['avdataoffset'] + 8 + (int) $thisfile_riff['header_size']; // 8 = "RIFF" + 32-bit offset
                 while ($nextRIFFoffset < min($info['filesize'], $info['avdataend'])) {
                     try {
@@ -306 +312 @@
                         // Keep only string as far as first null byte, discard rest of fixed-width data
                         // https://github.com/JamesHeinrich/getID3/issues/263
-                        $null_terminator_offset = strpos($thisfile_riff_WAVE_bext_0[$bext_key], "\x00");
-                        $thisfile_riff_WAVE_bext_0[$bext_key] = substr($thisfile_riff_WAVE_bext_0[$bext_key], 0, $null_terminator_offset);
+                        // https://github.com/JamesHeinrich/getID3/issues/430
+                        $null_terminator_rows = explode("\x00", $thisfile_riff_WAVE_bext_0[$bext_key]);
+                        $thisfile_riff_WAVE_bext_0[$bext_key] = $null_terminator_rows[0];
                     }
 
@@ -473 +480 @@
                                 if (substr($value, 0, 3) == '[{"') {
                                     if ($decoded = @json_decode($value, true)) {
-                                        if (!empty($decoded) && (count($decoded) == 1)) {
+                                        if (count($decoded) === 1) {
                                             $value = $decoded[0];
                                         } else {
@@ -1133 +1140 @@
                 foreach ($CommentsChunkNames as $key => $value) {
                     if (isset($thisfile_riff[$RIFFsubtype][$key][0]['data'])) {
-                        $thisfile_riff['comments'][$value][] = $thisfile_riff[$RIFFsubtype][$key][0]['data'];
+                        // https://github.com/JamesHeinrich/getID3/issues/430
+                        $null_terminator_rows = explode("\x00", $thisfile_riff[$RIFFsubtype][$key][0]['data']);
+                        $thisfile_riff['comments'][$value][] = $null_terminator_rows[0];
                     }
                 }
@@ -1225 +1234 @@
                 foreach ($CommentsChunkNames as $key => $value) {
                     if (isset($thisfile_riff[$RIFFsubtype][$key][0]['data'])) {
-                        $thisfile_riff['comments'][$value][] = $thisfile_riff[$RIFFsubtype][$key][0]['data'];
+                        // https://github.com/JamesHeinrich/getID3/issues/430
+                        $null_terminator_rows = explode("\x00", $thisfile_riff[$RIFFsubtype][$key][0]['data']);
+                        $thisfile_riff['comments'][$value][] = $null_terminator_rows[0];
                     }
                 }
@@ -1365 +1376 @@
 
         if ($info['playtime_seconds'] > 0) {
-            if (isset($thisfile_riff_audio) && isset($thisfile_riff_video)) {
+            if ($thisfile_riff_audio !== null && $thisfile_riff_video !== null) {
 
                 if (!isset($info['bitrate'])) {
@@ -1371 +1382 @@
                 }
 
-            } elseif (isset($thisfile_riff_audio) && !isset($thisfile_riff_video)) {
+            } elseif ($thisfile_riff_audio !== null && $thisfile_riff_video === null) { // @phpstan-ignore-line
 
                 if (!isset($thisfile_audio['bitrate'])) {
@@ -1377 +1388 @@
                 }
 
-            } elseif (!isset($thisfile_riff_audio) && isset($thisfile_riff_video)) {
+            } elseif ($thisfile_riff_audio === null && $thisfile_riff_video !== null) {
 
                 if (!isset($thisfile_video['bitrate'])) {
@@ -1602 +1613 @@
                     break;
                 }
-                if (($chunksize == 0) && ($chunkname != 'JUNK')) {
-                    $this->warning('Chunk ('.$chunkname.') size at offset '.($this->ftell() - 4).' is zero. Aborting RIFF parsing.');
-                    break;
+                if ($chunksize == 0) {
+                    if ($chunkname == 'JUNK') {
+                        // this is allowed
+                    } elseif ($chunkname == 'data') {
+                        // https://github.com/JamesHeinrich/getID3/issues/468
+                        // may occur in streaming files where the data size is unknown
+                        $chunksize = $info['avdataend'] - $this->ftell();
+                        $this->warning('RIFF.data size field is empty, assuming the correct value is filesize-offset ('.$chunksize.')');
+                    } else {
+                        $this->warning('Chunk ('.$chunkname.') size at offset '.($this->ftell() - 4).' is zero. Aborting RIFF parsing.');
+                        break;
+                    }
                 }
                 if (($chunksize % 2) != 0) {
@@ -1694 +1714 @@
                         }
                         $thisindex = 0;
-                        if (isset($RIFFchunk[$chunkname]) && is_array($RIFFchunk[$chunkname])) {
+                        if (isset($RIFFchunk[$chunkname])) {
                             $thisindex = count($RIFFchunk[$chunkname]);
                         }