extended frameHeader.windowSize to unsigned long long

dev
Yann Collet 2017-07-07 14:19:01 -07:00
parent 7758ed8458
commit e622330a3b
3 changed files with 6 additions and 4 deletions

View File

@ -346,7 +346,7 @@ size_t ZSTD_decompressStream(ZSTD_DStream* zds, ZSTD_outBuffer* output, ZSTD_inB
</b></pre><BR>
<pre><b>typedef struct {
unsigned long long frameContentSize;
size_t windowSize;
unsigned long long windowSize; </b>/* can be == frameContentSize */<b>
unsigned dictID;
unsigned checksumFlag;
} ZSTD_frameHeader;

View File

@ -375,7 +375,8 @@ unsigned long long ZSTD_getFrameContentSize(const void *src, size_t srcSize)
}
#endif
{ ZSTD_frameHeader fParams;
if (ZSTD_getFrameHeader(&fParams, src, srcSize) != 0) return ZSTD_CONTENTSIZE_ERROR;
if (ZSTD_getFrameHeader(&fParams, src, srcSize) != 0)
return ZSTD_CONTENTSIZE_ERROR;
if (fParams.windowSize == 0) {
/* Either skippable or empty frame, size == 0 either way */
return 0;
@ -442,7 +443,8 @@ unsigned long long ZSTD_findDecompressedSize(const void* src, size_t srcSize)
* compatible with legacy mode
* @return : decompressed size if known, 0 otherwise
note : 0 can mean any of the following :
- decompressed size is not present within frame header
- frame content is empty
- decompressed size field is not present in frame header
- frame header unknown / not supported
- frame header not complete (`srcSize` too small) */
unsigned long long ZSTD_getDecompressedSize(const void* src, size_t srcSize)

View File

@ -427,7 +427,7 @@ typedef struct {
typedef struct {
unsigned long long frameContentSize;
size_t windowSize;
unsigned long long windowSize; /* can be == frameContentSize */
unsigned dictID;
unsigned checksumFlag;
} ZSTD_frameHeader;