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

fix null pointer dereference

This commit is contained in:
Minglei Jin 2023-08-01 16:39:14 +08:00
parent 72ac5a4e3b
commit 94b9599f95
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/dnode/vnode/src/tsdb/tsdbCache.c
View File

@ -1598,21 +1598,21 @@ static void freeTableInfoFunc(void *param) {
} }
static STableLoadInfo *getTableLoadInfo(SCacheRowsReader *pReader, uint64_t uid) { static STableLoadInfo *getTableLoadInfo(SCacheRowsReader *pReader, uint64_t uid) {
STableLoadInfo *pInfo = NULL;
if (!pReader->pTableMap) { if (!pReader->pTableMap) {
pReader->pTableMap = tSimpleHashInit(pReader->numOfTables, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT)); pReader->pTableMap = tSimpleHashInit(pReader->numOfTables, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT));
tSimpleHashSetFreeFp(pReader->pTableMap, freeTableInfoFunc); tSimpleHashSetFreeFp(pReader->pTableMap, freeTableInfoFunc);
} }
pInfo = *(STableLoadInfo **)tSimpleHashGet(pReader->pTableMap, &uid, sizeof(uid)); STableLoadInfo **ppInfo = tSimpleHashGet(pReader->pTableMap, &uid, sizeof(uid));
if (!pInfo) { if (!ppInfo) {
pInfo = taosMemoryCalloc(1, sizeof(STableLoadInfo)); STableLoadInfo *pInfo = taosMemoryCalloc(1, sizeof(STableLoadInfo));
tSimpleHashPut(pReader->pTableMap, &uid, sizeof(uint64_t), &pInfo, POINTER_BYTES); tSimpleHashPut(pReader->pTableMap, &uid, sizeof(uint64_t), &pInfo, POINTER_BYTES);
ppInfo = &pInfo;
} }
return pInfo; return *ppInfo;
} }
static uint64_t *getUidList(SCacheRowsReader *pReader) { static uint64_t *getUidList(SCacheRowsReader *pReader) {