Changeset 23159 for branches/3.5/wp-includes/class-oembed.php

Timestamp:

12/10/2012 10:23:55 PM (14 years ago)

Author:

nacin

Message:

Sanity checks in oEmbed XML handling.

File:

• branches/3.5/wp-includes/class-oembed.php (modified) (1 diff)

branches/3.5/wp-includes/class-oembed.php

@@ -217 +217 @@
          */
         function _parse_xml( $response_body ) {
-                if ( function_exists('simplexml_load_string') ) {
-                        $errors = libxml_use_internal_errors( 'true' );
-                        $data = simplexml_load_string( $response_body );
-                        libxml_use_internal_errors( $errors );
-                        if ( ! is_object( $data ) )
-                                return false;
-
-                        $return = new stdClass;
-                        foreach ( $data as $key => $value )
-                                $return->$key = (string) $value;
-
-                        return $return;
-                }
-                return false;
+                if ( !function_exists('simplexml_load_string') ) {
+                        return false;
+                }
+
+                $errors = libxml_use_internal_errors( true );
+                $old_value = null;
+                if ( function_exists( 'libxml_disable_entity_loader' ) ) {
+                        $old_value = libxml_disable_entity_loader( true );
+                }
+
+                $dom = new DOMDocument;
+                $success = $dom->loadXML( $response_body );
+
+                if ( ! is_null( $old_value ) ) {
+                        libxml_disable_entity_loader( $old_value );
+                }
+                libxml_use_internal_errors( $errors );
+
+                if ( ! $success || isset( $dom->doctype ) ) {
+                        return false;
+                }
+
+                $data = simplexml_import_dom( $dom );
+                if ( ! is_object( $data ) )
+                        return false;
+
+                $return = new stdClass;
+                foreach ( $data as $key => $value )
+                        $return->$key = (string) $value;
+                return $return;
         }