Changeset 43934 for branches/5.0/src/wp-includes/wp-db.php

Timestamp:

11/22/2018 03:58:19 AM (8 years ago)

Author:

pento

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 preceeding query have failed.

Props spacedmonkey, desrosj.
See #45299.

File:

• branches/5.0/src/wp-includes/wp-db.php (modified) (2 diffs)

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

@@ -2457 +2457 @@
         $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;
@@ -2498 +2500 @@
             // 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;
+                    }
+                }
             }
             return $new_array;