Changeset 34145

Timestamp:

09/14/2015 10:47:19 PM (11 years ago)

Author:

nbachiyski

Message:

Shortcodes: don't allow unclosed HTML elements in attributes

Merges [34134] for 4.2 branch

Location:

branches/4.2/src/wp-includes

Files:

• media.php (modified) (1 diff)
• shortcodes.php (modified) (1 diff)

branches/4.2/src/wp-includes/media.php

@@ -848 +848 @@
                         $attr['caption'] = trim( $matches[2] );
                 }
+        } elseif ( strpos( $attr['caption'], '<' ) !== false ) {
+                $attr['caption'] = wp_kses( $attr['caption'], 'post' );
         }
 

branches/4.2/src/wp-includes/shortcodes.php

@@ -458 +458 @@
                                 $atts[] = stripcslashes($m[8]);
                 }
+
+                // Reject any unclosed HTML elements
+                foreach( $atts as &$value ) {
+                        if ( false !== strpos( $value, '<' ) ) {
+                                if ( 1 !== preg_match( '/^[^<]*+(?:<[^>]*+>[^<]*+)*+$/', $value ) ) {
+                                        $value = '';
+                                }
+                        }
+                }
         } else {
                 $atts = ltrim($text);