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

Timestamp:

07/02/2020 03:46:17 PM (5 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.id3v2.php (modified) (2 diffs)

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

@@ -15 +15 @@
 /////////////////////////////////////////////////////////////////
 
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+    exit;
+}
 getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v1.php', __FILE__, true);
 
@@ -521 +524 @@
             // note: MusicBrainz Picard incorrectly stores plaintext genres separated by "/" when writing in ID3v2.3 mode, hack-fix here:
             // replace / with NULL, then replace back the two ID3v1 genres that legitimately have "/" as part of the single genre name
-            if (preg_match('#/#', $genrestring)) {
+            if (strpos($genrestring, '/') !== false) {
+                $LegitimateSlashedGenreList = array(  // https://github.com/JamesHeinrich/getID3/issues/223
+                    'Pop/Funk',    // ID3v1 genre #62 - https://en.wikipedia.org/wiki/ID3#standard
+                    'Cut-up/DJ',   // Discogs - https://www.discogs.com/style/cut-up/dj
+                    'RnB/Swing',   // Discogs - https://www.discogs.com/style/rnb/swing
+                    'Funk / Soul', // Discogs (note spaces) - https://www.discogs.com/genre/funk+%2F+soul
+                );
                 $genrestring = str_replace('/', "\x00", $genrestring);
-                $genrestring = str_replace('Pop'."\x00".'Funk', 'Pop/Funk', $genrestring);
-                $genrestring = str_replace('Rock'."\x00".'Rock', 'Folk/Rock', $genrestring);
+                foreach ($LegitimateSlashedGenreList as $SlashedGenre) {
+                    $genrestring = str_ireplace(str_replace('/', "\x00", $SlashedGenre), $SlashedGenre, $genrestring);
+                }
             }
 
             // some other taggers separate multiple genres with semicolon, e.g. "Heavy Metal;Thrash Metal;Metal"
-            if (preg_match('#;#', $genrestring)) {
+            if (strpos($genrestring, ';') !== false) {
                 $genrestring = str_replace(';', "\x00", $genrestring);
             }