Changeset 48278 for trunk/src/wp-includes/ID3/module.tag.id3v1.php

Timestamp:

07/02/2020 03:46:17 PM (6 years ago)

Author:

desrosj

Message:

External Libraries: Update getID3 to version 1.9.20.

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

Props hareesh-pillai, desrosj.
Previously [47601-47604].
Fixes #49945.

File:

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

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

@@ -15 +15 @@
 /////////////////////////////////////////////////////////////////
 
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+    exit;
+}
 
 class getid3_id3v1 extends getid3_handler
@@ -63 +66 @@
                 $ParsedID3v1['comments'][$key][0] = $value;
             }
-            // ID3v1 encoding detection hack START
-            // ID3v1 is defined as always using ISO-8859-1 encoding, but it is not uncommon to find files tagged with ID3v1 using Windows-1251 or other character sets
-            // Since ID3v1 has no concept of character sets there is no certain way to know we have the correct non-ISO-8859-1 character set, but we can guess
-            $ID3v1encoding = 'ISO-8859-1';
-            foreach ($ParsedID3v1['comments'] as $tag_key => $valuearray) {
-                foreach ($valuearray as $key => $value) {
-                    if (preg_match('#^[\\x00-\\x40\\xA8\\xB8\\x80-\\xFF]+$#', $value)) {
-                        foreach (array('Windows-1251', 'KOI8-R') as $id3v1_bad_encoding) {
-                            if (function_exists('mb_convert_encoding') && @mb_convert_encoding($value, $id3v1_bad_encoding, $id3v1_bad_encoding) === $value) {
-                                $ID3v1encoding = $id3v1_bad_encoding;
-                                break 3;
-                            } elseif (function_exists('iconv') && @iconv($id3v1_bad_encoding, $id3v1_bad_encoding, $value) === $value) {
-                                $ID3v1encoding = $id3v1_bad_encoding;
-                                break 3;
+            $ID3v1encoding = $this->getid3->encoding_id3v1;
+            if ($this->getid3->encoding_id3v1_autodetect) {
+                // ID3v1 encoding detection hack START
+                // ID3v1 is defined as always using ISO-8859-1 encoding, but it is not uncommon to find files tagged with ID3v1 using Windows-1251 or other character sets
+                // Since ID3v1 has no concept of character sets there is no certain way to know we have the correct non-ISO-8859-1 character set, but we can guess
+                foreach ($ParsedID3v1['comments'] as $tag_key => $valuearray) {
+                    foreach ($valuearray as $key => $value) {
+                        if (preg_match('#^[\\x00-\\x40\\x80-\\xFF]+$#', $value) && !ctype_digit((string) $value)) { // check for strings with only characters above chr(128) and punctuation/numbers, but not just numeric strings (e.g. track numbers or years)
+                            foreach (array('Windows-1251', 'KOI8-R') as $id3v1_bad_encoding) {
+                                if (function_exists('mb_convert_encoding') && @mb_convert_encoding($value, $id3v1_bad_encoding, $id3v1_bad_encoding) === $value) {
+                                    $ID3v1encoding = $id3v1_bad_encoding;
+                                    $this->warning('ID3v1 detected as '.$id3v1_bad_encoding.' text encoding in '.$tag_key);
+                                    break 3;
+                                } elseif (function_exists('iconv') && @iconv($id3v1_bad_encoding, $id3v1_bad_encoding, $value) === $value) {
+                                    $ID3v1encoding = $id3v1_bad_encoding;
+                                    $this->warning('ID3v1 detected as '.$id3v1_bad_encoding.' text encoding in '.$tag_key);
+                                    break 3;
+                                }
                             }
                         }
                     }
                 }
-            }
-            // ID3v1 encoding detection hack END
+                // ID3v1 encoding detection hack END
+            }
 
             // ID3v1 data is supposed to be padded with NULL characters, but some taggers pad with spaces