Changeset 38288

Timestamp:

08/20/2016 02:31:31 AM (8 years ago)

Author:

boonebgorges

Message:

Query: Non-scalar and negative values for 'p' should always result in a 404.

Previously, the 'p' query var was being run through absint(), which
caused unexpected results.

Props Akeif, kouratoras.
Fixes #33372.

Location:

trunk

Files:

• src/wp-includes/query.php (modified) (1 diff)
• tests/phpunit/tests/query/parseQuery.php (modified) (1 diff)

trunk/src/wp-includes/query.php

@@ -1603 +1603 @@
             $this->is_robots = true;
 
-        $qv['p'] =  absint($qv['p']);
+        if ( ! is_scalar( $qv['p'] ) || $qv['p'] < 0 ) {
+            $qv['p'] = 0;
+            $qv['error'] = '404';
+        } else {
+            $qv['p'] = intval( $qv['p'] );
+        }
+
         $qv['page_id'] =  absint($qv['page_id']);
         $qv['year'] = absint($qv['year']);

trunk/tests/phpunit/tests/query/parseQuery.php

@@ -52 +52 @@
         $this->assertSame( true, $q->query_vars['s'] );
     }
+
+    /**
+     * @ticket 33372
+     */
+    public function test_parse_query_p_negative_int() {
+        $q = new WP_Query();
+        $q->parse_query( array(
+            'p' => -3,
+        ) );
+
+        $this->assertSame( '404', $q->query_vars['error'] );
+    }
+
+    /**
+     * @ticket 33372
+     */
+    public function test_parse_query_p_array() {
+        $q = new WP_Query();
+        $q->parse_query( array(
+            'p' => array(),
+        ) );
+
+        $this->assertSame( '404', $q->query_vars['error'] );
+    }
+
+    /**
+     * @ticket 33372
+     */
+    public function test_parse_query_p_object() {
+        $q = new WP_Query();
+        $q->parse_query( array(
+            'p' => new stdClass(),
+        ) );
+
+        $this->assertSame( '404', $q->query_vars['error'] );
+    }
+
 }