Changeset 44272 for trunk/src/wp-includes/wp-db.php

Timestamp:

12/17/2018 06:38:13 PM (8 years ago)

Author:

desrosj

Message:

WPDB: Check that $wpdb->last_result is countable before counting with it.

wpdb::get_col() iterates over $wpdb->last_result, which can be a non-countable value, should the preceding query have failed.

Props spacedmonkey, desrosj, pento.

Merges [43934] into trunk.

See #45299.

Location:

trunk

Files:

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

trunk/src/wp-includes/wp-db.php

@@ -2545 +2545 @@
                 $new_array = array();
                 // Extract the column values
-                for ( $i = 0, $j = count( $this->last_result ); $i < $j; $i++ ) {
-                        $new_array[ $i ] = $this->get_var( null, $x, $i );
+                if ( $this->last_result ) {
+                        for ( $i = 0, $j = count( $this->last_result ); $i < $j; $i++ ) {
+                                $new_array[ $i ] = $this->get_var( null, $x, $i );
+                        }
                 }
                 return $new_array;
@@ -2586 +2588 @@
                         // Return an array of row objects with keys from column 1
                         // (Duplicates are discarded)
-                        foreach ( $this->last_result as $row ) {
-                                $var_by_ref = get_object_vars( $row );
-                                $key        = array_shift( $var_by_ref );
-                                if ( ! isset( $new_array[ $key ] ) ) {
-                                        $new_array[ $key ] = $row;
+                        if ( $this->last_result ) {
+                                foreach ( $this->last_result as $row ) {
+                                        $var_by_ref = get_object_vars( $row );
+                                        $key        = array_shift( $var_by_ref );
+                                        if ( ! isset( $new_array[ $key ] ) ) {
+                                                $new_array[ $key ] = $row;
+                                        }
                                 }
                         }