thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-23 16:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix MergeTreeMarksLoader segfaulting if marks file is longer than expected (#51636)

Browse Source 
Co-authored-by: Nikita Mikhaylov <mikhaylovnikitka@gmail.com>
This commit is contained in:
Michael Kolupaev 2023-06-30 02:52:03 -07:00 committed by GitHub
parent 15fb4880b3
commit 2b55734ccf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Storages/MergeTree/MergeTreeMarksLoader.cpp
View File

@ -135,6 +135,7 @@ MarkCache::MappedPtr MergeTreeMarksLoader::loadMarksImpl()
if (!index_granularity_info.mark_type.adaptive) if (!index_granularity_info.mark_type.adaptive)
{ {
/// Read directly to marks. /// Read directly to marks.
chassert(expected_uncompressed_size == plain_marks.size() * sizeof(MarkInCompressedFile));
reader->readStrict(reinterpret_cast<char *>(plain_marks.data()), expected_uncompressed_size); reader->readStrict(reinterpret_cast<char *>(plain_marks.data()), expected_uncompressed_size);
if (!reader->eof()) if (!reader->eof())
@ -148,23 +149,25 @@ MarkCache::MappedPtr MergeTreeMarksLoader::loadMarksImpl()
} }
else else
{ {
size_t i = 0; for (size_t i = 0; i < marks_count; ++i)
size_t granularity;
while (!reader->eof())
{ {
if (reader->eof())
throw Exception(
ErrorCodes::CANNOT_READ_ALL_DATA,
"Cannot read all marks from file {}, marks expected {} (bytes size {}), marks read {} (bytes size {})",
mrk_path, marks_count, expected_uncompressed_size, i, reader->count());
size_t granularity;
reader->readStrict( reader->readStrict(
reinterpret_cast<char *>(plain_marks.data() + i * columns_in_mark), columns_in_mark * sizeof(MarkInCompressedFile)); reinterpret_cast<char *>(plain_marks.data() + i * columns_in_mark), columns_in_mark * sizeof(MarkInCompressedFile));
readIntBinary(granularity, *reader); readIntBinary(granularity, *reader);
++i;
} }
if (i * mark_size != expected_uncompressed_size) if (!reader->eof())
{
throw Exception( throw Exception(
ErrorCodes::CANNOT_READ_ALL_DATA, ErrorCodes::CANNOT_READ_ALL_DATA,
"Cannot read all marks from file {}, marks expected {} (bytes size {}), marks read {} (bytes size {})", "Too many marks in file {}, marks expected {} (bytes size {})",
mrk_path, marks_count, expected_uncompressed_size, i, reader->count()); mrk_path, marks_count, expected_uncompressed_size);
}
} }
auto res = std::make_shared<MarksInCompressedFile>(plain_marks); auto res = std::make_shared<MarksInCompressedFile>(plain_marks);