Skip to content

Commit

Permalink
Replace eval usage in request processing with new WP_MatchesMapRegex(…
Browse files Browse the repository at this point in the history
…) class usage. See #9602 props hakre.

git-svn-id: https://develop.svn.wordpress.org/trunk@11853 602fd350-edb4-49c9-b593-d223f7449a82
  • Loading branch information
westi committed Aug 20, 2009
1 parent 50bb241 commit 885fce4
Show file tree
Hide file tree
Showing 2 changed files with 93 additions and 3 deletions.
94 changes: 92 additions & 2 deletions wp-includes/classes.php
Expand Up @@ -214,9 +214,9 @@ function parse_request($extra_query_vars = '') {

// Trim the query of everything up to the '?'.
$query = preg_replace("!^.+\?!", '', $query);

// Substitute the substring matches into the query.
eval("@\$query = \"" . addslashes($query) . "\";");
$query = addslashes(WP_MatchesMapRegex::apply($query, $matches));

$this->matched_query = $query;

Expand Down Expand Up @@ -1592,4 +1592,94 @@ function send() {
}
}

/**
* Helper class to remove the need to use eval to replace $matches[] in query strings.
*
* @since 2.9.0
*/
class WP_MatchesMapRegex {
/**
* store for matches
*
* @access private
* @var array
*/
var $_matches;

/**
* store for mapping result
*
* @access public
* @var string
*/
var $output;

/**
* subject to perform mapping on (query string containing $matches[] references
*
* @access private
* @var string
*/
var $_subject;

/**
* regexp pattern to match $matches[] references
*
* @var string
*/
var $_pattern = '(\$matches\[[1-9]+[0-9]*\])'; // magic number

/**
* constructor
*
* @param string $subject subject if regex
* @param array $matches data to use in map
* @return self
*/
function WP_MatchesMapRegex($subject, $matches) {
$this->_subject = $subject;
$this->_matches = $matches;
$this->output = $this->_map();
}

/**
* Substitute substring matches in subject.
*
* static helper function to ease use
*
* @access public
* @param string $subject subject
* @param array $matches data used for subsitution
* @return string
*/
function apply($subject, $matches) {
$oSelf =& new WP_MatchesMapRegex($subject, $matches);
return $oSelf->output;
}

/**
* do the actual mapping
*
* @access private
* @return string
*/
function _map() {
$callback = array(&$this, 'callback');
return preg_replace_callback($this->_pattern, $callback, $this->_subject);
}

/**
* preg_replace_callback hook
*
* @access public
* @param array $matches preg_replace regexp matches
* @return string
*/
function callback($matches) {
$index = intval(substr($matches[0], 9, -1));
return ( isset( $this->_matches[$index] ) ? $this->_matches[$index] : '' );
}

}

?>
2 changes: 1 addition & 1 deletion wp-includes/rewrite.php
Expand Up @@ -299,7 +299,7 @@ function url_to_postid($url) {
$query = preg_replace("!^.+\?!", '', $query);

// Substitute the substring matches into the query.
eval("\$query = \"" . addslashes($query) . "\";");
$query = addslashes(WP_MatchesMapRegex::apply($query, $matches));
// Filter out non-public query vars
global $wp;
parse_str($query, $query_vars);
Expand Down

0 comments on commit 885fce4

Please sign in to comment.