nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #5272 from miqrogroove/patch-1

Browse source 
Ensure IN() Conditions Never Mix Data Types
This commit is contained in:
Hypolite Petovan 2018-06-22 11:10:05 -04:00 committed by GitHub
parent 423461f844 c37a8cc661
commit 9b35c3bff2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
include/dba.php
View file

@ -1299,37 +1299,28 @@ class dba {
$condition_string .= " AND "; $condition_string .= " AND ";
} }
if (is_array($value)) { if (is_array($value)) {
// Check if there are integer values in the parameters /* Workaround for MySQL Bug #64791.
* Never mix data types inside any IN() condition.
* In case of mixed types, cast all as string.
* Logic needs to be consistent with dba::p() data types.
*/
$is_int = false; $is_int = false;
$is_float = false;
$is_alpha = false; $is_alpha = false;
foreach ($value as $single_value) { foreach ($value as $single_value) {
if (is_int($single_value)) { if (is_int($single_value)) {
$is_int = true; $is_int = true;
} } else {
// To prevent to round floats we look for them
if (round($single_value) != (float)$single_value) {
$is_float = true;
}
// Is any non numeric value present?
if (!is_numeric($single_value)) {
$is_alpha = true; $is_alpha = true;
} }
} }
// Cast them all in an unique method if ($is_int && $is_alpha) {
if ($is_int) { foreach ($value as &$ref) {
$casted = []; if (is_int($ref)) {
foreach ($value as $single_value) { $ref = (string)$ref;
if (!$is_alpha && !$is_float) {
$casted[] = (int)$single_value;
} else {
$casted[] = (string)$single_value;
} }
} }
$value = $casted; unset($ref); //Prevent accidental re-use.
} }
$new_values = array_merge($new_values, array_values($value)); $new_values = array_merge($new_values, array_values($value));