sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check that search value is scalar before parsing. 

Prevents PHP notices when non-scalar values are passed.

Includes unit tests.

Props tivnet.
Fixes #29736.

git-svn-id: https://develop.svn.wordpress.org/trunk@29912 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Boone Gorges 2014-10-16 03:31:27 +00:00
parent 136bba8cfd
commit e36cac6794
2 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/wp-includes/query.php
View File

@ -1574,8 +1574,9 @@ class WP_Query {
if ( '' !== $qv['menu_order'] ) $qv['menu_order'] = absint($qv['menu_order']);
// Fairly insane upper bound for search string lengths.
if ( ! empty( $qv['s'] ) && strlen( $qv['s'] ) > 1600 )
if ( ! is_scalar( $qv['s'] ) || ( ! empty( $qv['s'] ) && strlen( $qv['s'] ) > 1600 ) ) {
$qv['s'] = '';
}
// Compat. Map subpost to attachment.
if ( '' != $qv['subpost'] )

54
tests/phpunit/tests/query/parseQuery.php Normal file
View File

@ -0,0 +1,54 @@
<?php
/**
* @group query
*/
class Tests_Query_ParseQuery extends WP_UnitTestCase {
/**
* @ticket 29736
*/
public function test_parse_query_s_array() {
$q = new WP_Query();
$q->parse_query( array(
's' => array( 'foo' ),
) );
$this->assertSame( '', $q->query_vars['s'] );
}
public function test_parse_query_s_string() {
$q = new WP_Query();
$q->parse_query( array(
's' => 'foo',
) );
$this->assertSame( 'foo', $q->query_vars['s'] );
}
public function test_parse_query_s_float() {
$q = new WP_Query();
$q->parse_query( array(
's' => 3.5,
) );
$this->assertSame( 3.5, $q->query_vars['s'] );
}
public function test_parse_query_s_int() {
$q = new WP_Query();
$q->parse_query( array(
's' => 3,
) );
$this->assertSame( 3, $q->query_vars['s'] );
}
public function test_parse_query_s_bool() {
$q = new WP_Query();
$q->parse_query( array(
's' => true,
) );
$this->assertSame( true, $q->query_vars['s'] );
}
}