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

Fix UBSan report in FixedHashTable

Browse Source
This commit is contained in:
Alexey Milovidov 2020-05-03 21:24:11 +03:00
parent 626b9a3ae9
commit 9a344e681f
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Common/HashTable/FixedHashTable.h
View File

@ -274,9 +274,21 @@ public:
return iterator(this, ptr); return iterator(this, ptr);
} }
const_iterator end() const { return const_iterator(this, buf + NUM_CELLS); } const_iterator end() const
const_iterator cend() const { return end(); } {
iterator end() { return iterator(this, buf + NUM_CELLS); } /// Avoid UBSan warning about adding zero to nullptr. It is valid in C++20 (and earlier) but not valid in C.
return const_iterator(this, buf ? buf + NUM_CELLS : buf);
}
const_iterator cend() const
{
return end();
}
iterator end()
{
return iterator(this, buf ? buf + NUM_CELLS : buf);
}
public: public:
@ -325,12 +337,17 @@ public:
Cell::State::write(wb); Cell::State::write(wb);
DB::writeVarUInt(m_size, wb); DB::writeVarUInt(m_size, wb);
if (!buf)
return;
for (auto ptr = buf, buf_end = buf + NUM_CELLS; ptr < buf_end; ++ptr) for (auto ptr = buf, buf_end = buf + NUM_CELLS; ptr < buf_end; ++ptr)
{
if (!ptr->isZero(*this)) if (!ptr->isZero(*this))
{ {
DB::writeVarUInt(ptr - buf); DB::writeVarUInt(ptr - buf);
ptr->write(wb); ptr->write(wb);
} }
}
} }
void writeText(DB::WriteBuffer & wb) const void writeText(DB::WriteBuffer & wb) const
@ -338,6 +355,9 @@ public:
Cell::State::writeText(wb); Cell::State::writeText(wb);
DB::writeText(m_size, wb); DB::writeText(m_size, wb);
if (!buf)
return;
for (auto ptr = buf, buf_end = buf + NUM_CELLS; ptr < buf_end; ++ptr) for (auto ptr = buf, buf_end = buf + NUM_CELLS; ptr < buf_end; ++ptr)
{ {
if (!ptr->isZero(*this)) if (!ptr->isZero(*this))