database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

[MCOL-4709] Fix UB in disk aggregation

Browse Source
This commit is contained in:
Alexey Antipovsky
2021-06-23 12:56:38 +03:00
parent 994e8027bd
commit 8a0b68f25e
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
utils/rowgroup/rowstorage.cpp
View File

@ -660,6 +660,19 @@ public:
fLRU->clear(); fLRU->clear();
fMM->release(); fMM->release();
fRGDatas.clear(); fRGDatas.clear();
// we need at least one RGData so create it right now
auto* curRG = new RGData(*fRowGroupOut, fMaxRows);
fRowGroupOut->setData(curRG);
fRowGroupOut->resetRowGroup(0);
fRGDatas.emplace_back(curRG);
auto memSz = fRowGroupOut->getSizeWithStrings(fMaxRows);
if (!fMM->acquire(memSz))
{
throw logging::IDBExcept(logging::IDBErrorInfo::instance()->errorMsg(
logging::ERR_AGGREGATION_TOO_BIG),
logging::ERR_AGGREGATION_TOO_BIG);
}
++fGeneration; ++fGeneration;
} }