Changeset 54376 for trunk/src/wp-includes/ID3/getid3.php

Timestamp:

10/04/2022 02:06:29 AM (2 years ago)

Author:

desrosj

Message:

External Libraries: Update getID3 to version 1.9.22.

This updates the getID3 library from version 1.9.21 to 1.9.22, which contains a number of bug fixes and improvements to PHP 8.1 support.

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

Props jrf, desrosj.
Fixes #56692.

File:

• trunk/src/wp-includes/ID3/getid3.php (modified) (8 diffs)

trunk/src/wp-includes/ID3/getid3.php

@@ -183 +183 @@
 
     /**
-     * Use MD5 of source file if availble - only FLAC and OptimFROG
+     * Use MD5 of source file if available - only FLAC and OptimFROG
      *
      * @var bool
@@ -388 +388 @@
     protected $startup_warning = '';
 
-    const VERSION           = '1.9.21-202109171300';
+    const VERSION           = '1.9.22-202207161647';
     const FREAD_BUFFER_SIZE = 32768;
 
@@ -394 +394 @@
     const ATTACHMENTS_INLINE = true;
 
+    /**
+     * @throws getid3_exception
+     */
     public function __construct() {
 
@@ -570 +573 @@
 
             // remote files not supported
-            if (preg_match('#^(ht|f)tp://#', $filename)) {
+            if (preg_match('#^(ht|f)tps?://#', $filename)) {
                 throw new getid3_exception('Remote files are not supported - please copy the file locally first');
             }
@@ -1056 +1059 @@
                         ),
 
-// has been known to produce false matches in random files (e.g. JPEGs), leave out until more precise matching available
-//              // MOD  - audio       - MODule (assorted sub-formats)
-//              'mod'  => array(
-//                          'pattern'   => '^.{1080}(M\\.K\\.|M!K!|FLT4|FLT8|[5-9]CHN|[1-3][0-9]CH)',
-//                          'group'     => 'audio',
-//                          'module'    => 'mod',
-//                          'option'    => 'mod',
-//                          'mime_type' => 'audio/mod',
-//                      ),
+
+                // MOD  - audio       - MODule (SoundTracker)
+                'mod'  => array(
+                            //'pattern'   => '^.{1080}(M\\.K\\.|M!K!|FLT4|FLT8|[5-9]CHN|[1-3][0-9]CH)', // has been known to produce false matches in random files (e.g. JPEGs), leave out until more precise matching available
+                            'pattern'   => '^.{1080}(M\\.K\\.)',
+                            'group'     => 'audio',
+                            'module'    => 'mod',
+                            'option'    => 'mod',
+                            'mime_type' => 'audio/mod',
+                        ),
 
                 // MOD  - audio       - MODule (Impulse Tracker)
@@ -1095 +1099 @@
                 // MPC  - audio       - Musepack / MPEGplus
                 'mpc'  => array(
-                            'pattern'   => '^(MPCK|MP\\+|[\\x00\\x01\\x10\\x11\\x40\\x41\\x50\\x51\\x80\\x81\\x90\\x91\\xC0\\xC1\\xD0\\xD1][\\x20-\\x37][\\x00\\x20\\x40\\x60\\x80\\xA0\\xC0\\xE0])',
+                            'pattern'   => '^(MPCK|MP\\+)',
                             'group'     => 'audio',
                             'module'    => 'mpc',
@@ -1550 +1554 @@
             $GetFileFormatArray = $this->GetFileFormatArray();
             $info = $GetFileFormatArray['mp3'];
+            $info['include'] = 'module.'.$info['group'].'.'.$info['module'].'.php';
+            return $info;
+        } elseif (preg_match('#\\.mp[cp\\+]$#i', $filename) && preg_match('#[\x00\x01\x10\x11\x40\x41\x50\x51\x80\x81\x90\x91\xC0\xC1\xD0\xD1][\x20-37][\x00\x20\x40\x60\x80\xA0\xC0\xE0]#s', $filedata)) {
+            // old-format (SV4-SV6) Musepack header that has a very loose pattern match and could falsely match other data (e.g. corrupt mp3)
+            // only enable this pattern check if the filename ends in .mpc/mpp/mp+
+            $GetFileFormatArray = $this->GetFileFormatArray();
+            $info = $GetFileFormatArray['mpc'];
             $info['include'] = 'module.'.$info['group'].'.'.$info['module'].'.php';
             return $info;
@@ -2199 +2210 @@
             return substr($this->data_string, $this->data_string_position - $bytes, $bytes);
         }
+        if ($bytes == 0) {
+            return '';
+        } elseif ($bytes < 0) {
+            throw new getid3_exception('cannot fread('.$bytes.' from '.$this->ftell().')', 10);
+        }
         $pos = $this->ftell() + $bytes;
         if (!getid3_lib::intValueSupported($pos)) {