facebook
/
zstd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fileio.c: detect .gz files

dev
Przemyslaw Skibinski 2016-11-30 13:34:21 +01:00
parent 99f30571e0
commit 0e14675df2
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
programs/fileio.c
View File

@ -74,6 +74,7 @@
#define MAX_DICT_SIZE (8 MB) /* protection against large input (attack scenario) */ #define MAX_DICT_SIZE (8 MB) /* protection against large input (attack scenario) */
#define FNSPACE 30 #define FNSPACE 30
#define GZ_EXTENSION ".gz"
/*-************************************* /*-*************************************
@ -658,11 +659,20 @@ static int FIO_decompressSrcFile(dRess_t ress, const char* srcFileName)
FILE* const dstFile = ress.dstFile; FILE* const dstFile = ress.dstFile;
FILE* srcFile; FILE* srcFile;
unsigned readSomething = 0; unsigned readSomething = 0;
size_t const suffixSize = strlen(GZ_EXTENSION);
size_t const sfnSize = strlen(srcFileName);
const char* const suffixPtr = srcFileName + sfnSize - suffixSize;
if (sfnSize > suffixSize && strcmp(suffixPtr, GZ_EXTENSION) == 0) {
DISPLAYLEVEL(1, "zstd: %s: gz file cannot be uncompressed -- ignored \n", srcFileName);
return 1;
}
if (UTIL_isDirectory(srcFileName)) { if (UTIL_isDirectory(srcFileName)) {
DISPLAYLEVEL(1, "zstd: %s is a directory -- ignored \n", srcFileName); DISPLAYLEVEL(1, "zstd: %s is a directory -- ignored \n", srcFileName);
return 1; return 1;
} }
srcFile = FIO_openSrcFile(srcFileName); srcFile = FIO_openSrcFile(srcFileName);
if (srcFile==0) return 1; if (srcFile==0) return 1;
@ -763,6 +773,7 @@ int FIO_decompressMultipleFilenames(const char** srcNamesTable, unsigned nbFiles
if (fclose(ress.dstFile)) EXM_THROW(72, "Write error : cannot properly close stdout"); if (fclose(ress.dstFile)) EXM_THROW(72, "Write error : cannot properly close stdout");
} else { } else {
size_t const suffixSize = strlen(suffix); size_t const suffixSize = strlen(suffix);
size_t const gzSuffixSize = strlen(GZ_EXTENSION);
size_t dfnSize = FNSPACE; size_t dfnSize = FNSPACE;
unsigned u; unsigned u;
char* dstFileName = (char*)malloc(FNSPACE); char* dstFileName = (char*)malloc(FNSPACE);
@ -771,6 +782,7 @@ int FIO_decompressMultipleFilenames(const char** srcNamesTable, unsigned nbFiles
const char* const srcFileName = srcNamesTable[u]; const char* const srcFileName = srcNamesTable[u];
size_t const sfnSize = strlen(srcFileName); size_t const sfnSize = strlen(srcFileName);
const char* const suffixPtr = srcFileName + sfnSize - suffixSize; const char* const suffixPtr = srcFileName + sfnSize - suffixSize;
const char* const gzSuffixPtr = srcFileName + sfnSize - gzSuffixSize;
if (dfnSize+suffixSize <= sfnSize+1) { if (dfnSize+suffixSize <= sfnSize+1) {
free(dstFileName); free(dstFileName);
dfnSize = sfnSize + 20; dfnSize = sfnSize + 20;
@ -778,12 +790,18 @@ int FIO_decompressMultipleFilenames(const char** srcNamesTable, unsigned nbFiles
if (dstFileName==NULL) EXM_THROW(74, "not enough memory for dstFileName"); if (dstFileName==NULL) EXM_THROW(74, "not enough memory for dstFileName");
} }
if (sfnSize <= suffixSize || strcmp(suffixPtr, suffix) != 0) { if (sfnSize <= suffixSize || strcmp(suffixPtr, suffix) != 0) {
if (sfnSize <= gzSuffixSize || strcmp(gzSuffixPtr, GZ_EXTENSION) != 0) {
DISPLAYLEVEL(1, "zstd: %s: unknown suffix (%4s expected) -- ignored \n", srcFileName, suffix); DISPLAYLEVEL(1, "zstd: %s: unknown suffix (%4s expected) -- ignored \n", srcFileName, suffix);
skippedFiles++; skippedFiles++;
continue; continue;
} else {
memcpy(dstFileName, srcFileName, sfnSize - gzSuffixSize);
dstFileName[sfnSize-gzSuffixSize] = '\0';
} }
} else {
memcpy(dstFileName, srcFileName, sfnSize - suffixSize); memcpy(dstFileName, srcFileName, sfnSize - suffixSize);
dstFileName[sfnSize-suffixSize] = '\0'; dstFileName[sfnSize-suffixSize] = '\0';
}
missingFiles += FIO_decompressDstFile(ress, dstFileName, srcFileName); missingFiles += FIO_decompressDstFile(ress, dstFileName, srcFileName);
} }