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

Merge pull request #1596 from taosdata/hotfix/fix_valgrind_warning 

fix valgrind warning
This commit is contained in:
slguan 2020-04-12 23:10:10 +08:00 committed by GitHub
parent 3c38c5f993 d2e0f7de02
commit 2900f2bddd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/vnode/tsdb/src/tsdbMain.c
View File

@ -813,6 +813,13 @@ static SSkipListIterator **tsdbCreateTableIters(STsdbMeta *pMeta, int maxTables)
return iters; return iters;
} }
static void tsdbFreeMemTable(SMemTable *pMemTable) {
if (pMemTable) {
tSkipListDestroy(pMemTable->pData);
free(pMemTable);
}
}
// Commit to file // Commit to file
static void *tsdbCommitData(void *arg) { static void *tsdbCommitData(void *arg) {
// TODO // TODO
@ -859,7 +866,8 @@ static void *tsdbCommitData(void *arg) {
// TODO: free the skiplist // TODO: free the skiplist
for (int i = 0; i < pCfg->maxTables; i++) { for (int i = 0; i < pCfg->maxTables; i++) {
STable *pTable = pMeta->tables[i]; STable *pTable = pMeta->tables[i];
if (pTable && pTable->imem) { // Here has memory leak if (pTable && pTable->imem) {
tsdbFreeMemTable(pTable->imem);
pTable->imem = NULL; pTable->imem = NULL;
} }
} }

2
src/vnode/tsdb/src/tsdbMeta.c
View File

@ -34,7 +34,7 @@ void *tsdbEncodeTable(STable *pTable, int *contLen) {
*contLen = tsdbEstimateTableEncodeSize(pTable); *contLen = tsdbEstimateTableEncodeSize(pTable);
if (*contLen < 0) return NULL; if (*contLen < 0) return NULL;
void *ret = malloc(*contLen); void *ret = calloc(1, *contLen);
if (ret == NULL) return NULL; if (ret == NULL) return NULL;
void *ptr = ret; void *ptr = ret;