fixes for tests and segfault

This commit is contained in:
Sen Huang
2019-09-06 11:10:53 -07:00
parent a9c807a948
commit 30bff50e06
5 changed files with 26 additions and 22 deletions
+6 -16
View File
@@ -1453,7 +1453,9 @@ int FIO_compressMultipleFilenames(FIO_prefs_t* const prefs, const char** inFileN
} }
FIO_freeCResources(ress);
UTIL_freeDestinationFilenameTable(dstFileNamesTable, nbFiles);
if (outDirName)
UTIL_freeDestinationFilenameTable(dstFileNamesTable, nbFiles);
return error;
}
@@ -2274,24 +2276,12 @@ FIO_decompressMultipleFilenames(FIO_prefs_t* const prefs,
}
FIO_freeDResources(ress);
UTIL_freeDestinationFilenameTable(dstFileNamesTable, nbFiles);
if (outDirName)
UTIL_freeDestinationFilenameTable(dstFileNamesTable, nbFiles);
return error;
}
void FIO_processMultipleFilenameDestinationDir(char** dstFilenameTable,
const char** filenameTable, unsigned filenameIdx,
const char* outFileName, const char* outDirName) {
int dirResult;
dirResult = UTIL_createDir(outDirName);
if (dirResult)
DISPLAY("Directory creation unsuccessful \n");
UTIL_createDestinationDirTable(filenameTable, filenameIdx, outDirName, dstFilenameTable);
if (outFileName) {
outFileName = dstFilenameTable[0]; /* in case -O is called with single file */
}
}
/* **************************************************************************
* .zst file info (--list command)
***************************************************************************/