ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zstd: fix crash when not overwriting existing files

Browse Source 
This fixes the following crash:
  $ touch exists
  $ programs/zstd -r examples/ -o exists
  zstd: exists already exists; not overwritten
  Segmentation fault (core dumped)

* programs/fileio.c (FIO_compressMultipleFilenames):
Handle the case where we're not overwriting the destination.

Reported at https://bugzilla.redhat.com/1530049
This commit is contained in:
Pádraig Brady
2018-01-02 15:24:09 +00:00
parent 2eff217136
commit e0596715dc
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
programs/fileio.c
+4
View File
@@ -951,10 +951,14 @@ int FIO_compressMultipleFilenames(const char** inFileNamesTable, unsigned nbFile
if (outFileName != NULL) { if (outFileName != NULL) {
unsigned u; unsigned u;
ress.dstFile = FIO_openDstFile(outFileName); ress.dstFile = FIO_openDstFile(outFileName);
if (ress.dstFile==NULL) { /* could not open outFileName */
missed_files = nbFiles;
} else {
for (u=0; u<nbFiles; u++) for (u=0; u<nbFiles; u++)
missed_files += FIO_compressFilename_srcFile(ress, outFileName, inFileNamesTable[u], compressionLevel); missed_files += FIO_compressFilename_srcFile(ress, outFileName, inFileNamesTable[u], compressionLevel);
if (fclose(ress.dstFile)) if (fclose(ress.dstFile))
EXM_THROW(29, "Write error : cannot properly close stdout"); EXM_THROW(29, "Write error : cannot properly close stdout");
}
} else { } else {
unsigned u; unsigned u;
for (u=0; u<nbFiles; u++) { for (u=0; u<nbFiles; u++) {