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

Merge pull request #4601 from taosdata/coverity-fix 

[TD-2438]<fix>: Coverity fix
This commit is contained in:
Shengliang Guan 2020-12-18 09:37:41 +08:00 committed by GitHub
parent 83469b7b7f 99e31ce57e
commit 604321dff2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/wal/src/walWrite.c
View File

@ -297,16 +297,14 @@ static int32_t walRestoreWalFile(SWal *pWal, void *pVnode, FWalWrite writeFp, ch
} }
} }
if (pHead->len > size - sizeof(SWalHead)) { if (pHead->len < 0 || pHead->len > size - sizeof(SWalHead)) {
size = sizeof(SWalHead) + pHead->len; wError("vgId:%d, file:%s, wal head len out of range, hver:%" PRIu64 " len:%d offset:%" PRId64, pWal->vgId, name,
buffer = realloc(buffer, size); pHead->version, pHead->len, offset);
if (buffer == NULL) { code = walSkipCorruptedRecord(pWal, pHead, tfd, &offset);
wError("vgId:%d, file:%s, failed to open for restore since %s", pWal->vgId, name, strerror(errno)); if (code != TSDB_CODE_SUCCESS) {
code = TAOS_SYSTEM_ERROR(errno); walFtruncate(pWal, tfd, offset);
break; break;
} }
pHead = buffer;
} }
ret = tfRead(tfd, pHead->cont, pHead->len); ret = tfRead(tfd, pHead->cont, pHead->len);

2
src/wal/test/waltest.c
View File

@ -76,7 +76,7 @@ int main(int argc, char *argv[]) {
taosInitLog("wal.log", 100000, 10); taosInitLog("wal.log", 100000, 10);
SWalCfg walCfg; SWalCfg walCfg = {0};
walCfg.walLevel = level; walCfg.walLevel = level;
walCfg.keep = keep; walCfg.keep = keep;