thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-26 17:41:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix integer overflow in arrayIntersect.

Browse Source
This commit is contained in:
Nikolai Kochetov 2019-11-14 12:46:10 +03:00
parent f2bbfd995a
commit 5440700299
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dbms/src/Functions/array/arrayIntersect.cpp
View File

@ -436,7 +436,17 @@ ColumnPtr FunctionArrayIntersect::execute(const UnpackedArrays & arrays, Mutable
typename Map::mapped_type * value = nullptr; typename Map::mapped_type * value = nullptr;
if constexpr (is_numeric_column) if constexpr (is_numeric_column)
value = &map[columns[arg]->getElement(i)]; {
auto element = columns[arg]->getElement(i);
/// Do nothing in case of integer overflow. It happen if narrower type is used for the result.
/// E.g. arrayIntersect([-100], [156]) is (Array(Int8), Array(UInt8)) -> Array(UInt8)
/// and static_cast<UInt8>(-100) is 156 which is != -100. Without this check the result is [156].
if (element != static_cast<typename ColumnType::value_type>(element))
continue;
value = &map[element];
}
else if constexpr (std::is_same<ColumnType, ColumnString>::value || std::is_same<ColumnType, ColumnFixedString>::value) else if constexpr (std::is_same<ColumnType, ColumnString>::value || std::is_same<ColumnType, ColumnFixedString>::value)
value = &map[columns[arg]->getDataAt(i)]; value = &map[columns[arg]->getDataAt(i)];
else else
@ -445,6 +455,7 @@ ColumnPtr FunctionArrayIntersect::execute(const UnpackedArrays & arrays, Mutable
value = &map[columns[arg]->serializeValueIntoArena(i, arena, data)]; value = &map[columns[arg]->serializeValueIntoArena(i, arena, data)];
} }
/// Here we count the number of element appearances, but no more than once per array.
if (*value == arg) if (*value == arg)
++(*value); ++(*value);
} }