From 076560290346c3f83137c6f10f3d5a33efc234aa Mon Sep 17 00:00:00 2001 From: Paul Cruz Date: Tue, 20 Jun 2017 14:04:46 -0700 Subject: [PATCH] fixed error where extremely small files were not being detected as not compressed with zstd --- programs/fileio.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/programs/fileio.c b/programs/fileio.c index 37ec7f815..bf65ba528 100644 --- a/programs/fileio.c +++ b/programs/fileio.c @@ -889,10 +889,15 @@ static int getFileInfo(fileInfo_t* info, const char* inFileName){ BYTE headerBuffer[ZSTD_FRAMEHEADERSIZE_MAX]; size_t const numBytesRead = fread(headerBuffer, 1, sizeof(headerBuffer), srcFile); if (numBytesRead < ZSTD_frameHeaderSize_min) { - if (feof(srcFile)) { + if (feof(srcFile) && numBytesRead == 0) { break; } - else{ + else if (feof(srcFile)) { + DISPLAY("Error: reached end of file with incomplete frame\n"); + detectError = 2; + break; + } + else { DISPLAY("Error: did not reach end of file but ran out of frames\n"); detectError = 1; break;