xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #27755 from taosdata/fix/TD-31971-3.0 

fix(query)[TD-31971]. Fix potential wild pointer access in tsdbReaderClose
This commit is contained in:
Pan Wei 2024-09-10 08:52:09 +08:00 committed by GitHub
parent bedc5791be 1ef8574429
commit 99f320b7e0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/dnode/vnode/src/tsdb/tsdbRead2.c
View File

@ -4580,6 +4580,8 @@ int32_t tsdbSetTableList2(STsdbReader* pReader, const void* pTableList, int32_t
clearBlockScanInfo(*p); clearBlockScanInfo(*p);
} }
tSimpleHashClear(pReader->status.pTableMap);
if (size < num) { if (size < num) {
code = ensureBlockScanInfoBuf(&pReader->blockInfoBuf, num); code = ensureBlockScanInfoBuf(&pReader->blockInfoBuf, num);
if (code) { if (code) {
@ -4596,7 +4598,6 @@ int32_t tsdbSetTableList2(STsdbReader* pReader, const void* pTableList, int32_t
pReader->status.uidList.tableUidList = (uint64_t*)p1; pReader->status.uidList.tableUidList = (uint64_t*)p1;
} }
tSimpleHashClear(pReader->status.pTableMap);
STableUidList* pUidList = &pReader->status.uidList; STableUidList* pUidList = &pReader->status.uidList;
pUidList->currentIndex = 0; pUidList->currentIndex = 0;