Changeset 50714

Timestamp:

04/14/2021 11:08:25 PM (5 years ago)

Author:

desrosj

Message:

External libraries: Include upstream GetID3 fix for PHP 8.

Props jrf, xknown.

File:

• trunk/src/wp-includes/ID3/getid3.lib.php (modified) (1 diff)

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

@@ -721 +721 @@
         public static function XML2array($XMLstring) {
                 if (function_exists('simplexml_load_string') && function_exists('libxml_disable_entity_loader')) {
-                        if (PHP_VERSION_ID < 80000) {
-                                // http://websec.io/2012/08/27/Preventing-XEE-in-PHP.html
-                                // https://core.trac.wordpress.org/changeset/29378
-                                // This function has been deprecated in PHP 8.0 because in libxml 2.9.0, external entity loading is
-                                // disabled by default, so this function is no longer needed to protect against XXE attacks.
-                                $loader = libxml_disable_entity_loader(true);
-                        }
+                        // http://websec.io/2012/08/27/Preventing-XEE-in-PHP.html
+                        // https://core.trac.wordpress.org/changeset/29378
+                        // This function has been deprecated in PHP 8.0 because in libxml 2.9.0, external entity loading is
+                        // disabled by default, but is still needed when LIBXML_NOENT is used.
+                        $loader = @libxml_disable_entity_loader(true);
                         $XMLobject = simplexml_load_string($XMLstring, 'SimpleXMLElement', LIBXML_NOENT);
                         $return = self::SimpleXMLelement2array($XMLobject);
-                        if (PHP_VERSION_ID < 80000 && isset($loader)) {
-                                libxml_disable_entity_loader($loader);
-                        }
+                        @libxml_disable_entity_loader($loader);
                         return $return;
                 }