WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Shortcodes: don't allow unclosed HTML elements in attributes 

Merges [34134] for 4.2 branch

Built from https://develop.svn.wordpress.org/branches/4.2@34145


git-svn-id: http://core.svn.wordpress.org/branches/4.2@34113 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Nikolay Bachiyski 2015-09-14 22:48:27 +00:00
parent c8d3901f8f
commit a4dba03383
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/media.php
View File

@ -847,6 +847,8 @@ function img_caption_shortcode( $attr, $content = null ) {
$content = $matches[1]; $content = $matches[1];
$attr['caption'] = trim( $matches[2] ); $attr['caption'] = trim( $matches[2] );
} }
} elseif ( strpos( $attr['caption'], '<' ) !== false ) {
$attr['caption'] = wp_kses( $attr['caption'], 'post' );
} }
/** /**

9
wp-includes/shortcodes.php
View File

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