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

Changed : max dictionary file size increased to 8 MB

Browse Source
This commit is contained in:
Yann Collet
2016-05-31 02:40:42 +02:00
parent 6381e99fb2
commit 6fca9e7545
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
programs/fileio.c
+7 -7
View File
@@ -97,7 +97,7 @@
#define CACHELINE 64 #define CACHELINE 64
#define MAX_DICT_SIZE (1 MB) /* protection against large input (attack scenario) ; can be changed */ #define MAX_DICT_SIZE (8 MB) /* protection against large input (attack scenario) */
#define FNSPACE 30 #define FNSPACE 30
@@ -214,12 +214,12 @@ static FILE* FIO_openDstFile(const char* dstFileName)
/*! FIO_loadFile() : /*! FIO_loadFile() :
* creates a buffer, pointed by `*bufferPtr`, * creates a buffer, pointed by `*bufferPtr`,
* loads `filename` content into it, * loads `filename` content into it,
* up to MAX_DICT_SIZE bytes * up to MAX_DICT_SIZE bytes.
* @return : loaded size
*/ */
static size_t FIO_loadFile(void** bufferPtr, const char* fileName) static size_t FIO_loadFile(void** bufferPtr, const char* fileName)
{ {
FILE* fileHandle; FILE* fileHandle;
size_t readSize;
U64 fileSize; U64 fileSize;
*bufferPtr = NULL; *bufferPtr = NULL;
@@ -239,8 +239,8 @@ static size_t FIO_loadFile(void** bufferPtr, const char* fileName)
} }
*bufferPtr = (BYTE*)malloc((size_t)fileSize); *bufferPtr = (BYTE*)malloc((size_t)fileSize);
if (*bufferPtr==NULL) EXM_THROW(34, "Allocation error : not enough memory for dictBuffer"); if (*bufferPtr==NULL) EXM_THROW(34, "Allocation error : not enough memory for dictBuffer");
readSize = fread(*bufferPtr, 1, (size_t)fileSize, fileHandle); { size_t const readSize = fread(*bufferPtr, 1, (size_t)fileSize, fileHandle);
if (readSize!=fileSize) EXM_THROW(35, "Error reading dictionary file %s", fileName); if (readSize!=fileSize) EXM_THROW(35, "Error reading dictionary file %s", fileName); }
fclose(fileHandle); fclose(fileHandle);
return (size_t)fileSize; return (size_t)fileSize;
} }
@@ -316,8 +316,8 @@ static int FIO_compressFilename_internal(cRess_t ress,
params.fParams.noDictIDFlag = !g_dictIDFlag; params.fParams.noDictIDFlag = !g_dictIDFlag;
if (g_maxWLog) if (params.cParams.windowLog > g_maxWLog) params.cParams.windowLog = g_maxWLog; if (g_maxWLog) if (params.cParams.windowLog > g_maxWLog) params.cParams.windowLog = g_maxWLog;
{ size_t const errorCode = ZBUFF_compressInit_advanced(ress.ctx, ress.dictBuffer, ress.dictBufferSize, params, fileSize); { size_t const errorCode = ZBUFF_compressInit_advanced(ress.ctx, ress.dictBuffer, ress.dictBufferSize, params, fileSize);
if (ZBUFF_isError(errorCode)) EXM_THROW(21, "Error initializing compression : %s", ZBUFF_getErrorName(errorCode)); } if (ZBUFF_isError(errorCode)) EXM_THROW(21, "Error initializing compression : %s", ZBUFF_getErrorName(errorCode));
} } }
/* Main compression loop */ /* Main compression loop */
readsize = 0; readsize = 0;