Changeset 41473 for branches/4.6/src/wp-includes/wp-db.php

Timestamp:

09/19/2017 02:59:26 PM (9 years ago)

Author:

aaroncampbell

Message:

Database: Hardening for wpdb::prepare()

Previously if you passed an array of values for placeholders, additional values could be passed as well. Now additional values will be ignored.

Merges [41470] to 4.6 branch.

Location:

branches/4.6

Files:

• . (modified) (1 prop)
• src/wp-includes/wp-db.php (modified) (1 diff)

branches/4.6/src/wp-includes/wp-db.php

@@ -1299 +1299 @@
                 $args = func_get_args();
                 array_shift( $args );
+
                 // If args were passed as an array (as in vsprintf), move them up
-                if ( isset( $args[0] ) && is_array($args[0]) )
+                if ( is_array( $args[0] ) && count( $args ) == 1 ) {
                         $args = $args[0];
+                }
+
+                foreach ( $args as $arg ) {
+                        if ( ! is_scalar( $arg ) ) {
+                                _doing_it_wrong( 'wpdb::prepare', sprintf( 'Unsupported value type (%s).', gettype( $arg ) ), '4.6.7' );
+                        }
+                }
+
                 $query = str_replace( "'%s'", '%s', $query ); // in case someone mistakenly already singlequoted it
                 $query = str_replace( '"%s"', '%s', $query ); // doublequote unquoting