folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix resource leaks on zstd open error paths 

If zstd stream initialization fails, the opened fd and the stream
itself are leaked. Handle error exit in a central label.
This commit is contained in:
Panu Matilainen 2019-11-21 12:22:45 +02:00
parent b55fef0903
commit 6b18e76f3d
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rpmio/rpmio.c
View File

@ -1128,13 +1128,13 @@ static rpmzstd rpmzstdNew(int fdno, const char *fmode)
if ((flags & O_ACCMODE) == O_RDONLY) { /* decompressing */
if ((_stream = (void *) ZSTD_createDStream()) == NULL
|| ZSTD_isError(ZSTD_initDStream(_stream))) {
return NULL;
goto err;
}
nb = ZSTD_DStreamInSize();
} else { /* compressing */
if ((_stream = (void *) ZSTD_createCStream()) == NULL
|| ZSTD_isError(ZSTD_initCStream(_stream, level))) {
return NULL;
goto err;
}
nb = ZSTD_CStreamOutSize();
}
@ -1149,6 +1149,14 @@ static rpmzstd rpmzstdNew(int fdno, const char *fmode)
zstd->b = xmalloc(nb);
return zstd;
err:
fclose(fp);
if ((flags & O_ACCMODE) == O_RDONLY)
ZSTD_freeDStream(_stream);
else
ZSTD_freeCStream(_stream);
return NULL;
}
static FD_t zstdFdopen(FD_t fd, int fdno, const char * fmode)