Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions getid3/getid3.lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@

if (!defined('GETID3_LIBXML_OPTIONS') && defined('LIBXML_VERSION')) {
if (LIBXML_VERSION >= 20621) {
define('GETID3_LIBXML_OPTIONS', LIBXML_NONET | LIBXML_NOWARNING | LIBXML_COMPACT);
define('GETID3_LIBXML_OPTIONS', LIBXML_NONET | LIBXML_NOENT | LIBXML_NOWARNING | LIBXML_COMPACT);
} else {
define('GETID3_LIBXML_OPTIONS', LIBXML_NONET | LIBXML_NOWARNING);
define('GETID3_LIBXML_OPTIONS', LIBXML_NONET | LIBXML_NOENT | LIBXML_NOWARNING);
}
}

Expand Down Expand Up @@ -746,10 +746,14 @@ public static function XML2array($XMLstring) {
// 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);
$loader = libxml_disable_entity_loader(true);
if ($loader === false && !libxml_disable_entity_loader(true)) {
// Failed to disable external entity loading — refuse to parse to prevent XXE
return false;
}
$XMLobject = simplexml_load_string($XMLstring, 'SimpleXMLElement', GETID3_LIBXML_OPTIONS);
$return = self::SimpleXMLelement2array($XMLobject);
@libxml_disable_entity_loader($loader);
libxml_disable_entity_loader($loader);
return $return;
}
} else {
Expand Down