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

Merge pull request #22571 from taosdata/fix/TD-25823 

fix: taosCompressFile mem leak
This commit is contained in:
dapan1121 2023-08-25 17:08:50 +08:00 committed by GitHub
parent 4f2e1ffb4d 250a8a7c39
commit 01e1bc2712
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/os/src/osFile.c
View File

@ -885,13 +885,16 @@ int32_t taosCompressFile(char *srcFileName, char *destFileName) {
char *data = taosMemoryMalloc(compressSize); char *data = taosMemoryMalloc(compressSize);
gzFile dstFp = NULL; gzFile dstFp = NULL;
TdFilePtr pSrcFile = taosOpenFile(srcFileName, TD_FILE_READ | TD_FILE_STREAM); TdFilePtr pFile = NULL;
TdFilePtr pSrcFile = NULL;
pSrcFile = taosOpenFile(srcFileName, TD_FILE_READ | TD_FILE_STREAM);
if (pSrcFile == NULL) { if (pSrcFile == NULL) {
ret = -1; ret = -1;
goto cmp_end; goto cmp_end;
} }
TdFilePtr pFile = taosOpenFile(destFileName, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC); pFile = taosOpenFile(destFileName, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC);
if (pFile == NULL) { if (pFile == NULL) {
ret = -2; ret = -2;
goto cmp_end; goto cmp_end;
@ -910,6 +913,9 @@ int32_t taosCompressFile(char *srcFileName, char *destFileName) {
} }
cmp_end: cmp_end:
if (pFile) {
taosCloseFile(&pFile);
}
if (pSrcFile) { if (pSrcFile) {
taosCloseFile(&pSrcFile); taosCloseFile(&pSrcFile);
} }