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

Timestamp:

06/28/2015 12:16:17 AM (9 years ago)

Author:

wonderboymusic

Message:

Update getID3 to 1.9.9

Changelog:

• ​https://github.com/JamesHeinrich/getID3/blob/master/changelog.txt
• ​https://github.com/JamesHeinrich/getID3/compare/v1.9.8...v1.9.9

Fixes #32806.

File:

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

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

@@ -520 +520 @@
 
     public static function XML2array($XMLstring) {
-        if ( function_exists( 'simplexml_load_string' ) && function_exists( 'libxml_disable_entity_loader' ) ) {
-            $loader = libxml_disable_entity_loader( true );
-            $XMLobject = simplexml_load_string( $XMLstring, 'SimpleXMLElement', LIBXML_NOENT );
-            $return = self::SimpleXMLelement2array( $XMLobject );
-            libxml_disable_entity_loader( $loader );
+        if (function_exists('simplexml_load_string') && function_exists('libxml_disable_entity_loader')) {
+            // http://websec.io/2012/08/27/Preventing-XEE-in-PHP.html
+            // https://core.trac.wordpress.org/changeset/29378
+            $loader = libxml_disable_entity_loader(true);
+            $XMLobject = simplexml_load_string($XMLstring, 'SimpleXMLElement', LIBXML_NOENT);
+            $return = self::SimpleXMLelement2array($XMLobject);
+            libxml_disable_entity_loader($loader);
             return $return;
         }
@@ -1164 +1166 @@
                 fclose($tmp);
                 $GetDataImageSize = @getimagesize($tempfilename, $imageinfo);
+                $GetDataImageSize['height'] = $GetDataImageSize[0];
+                $GetDataImageSize['width']  = $GetDataImageSize[1];
             }
             unlink($tempfilename);