added tests with null files, changed condition to check that the file is more than...

diff --git a/programs/fileio.c b/programs/fileio.c
index bf65ba5283f5561b1f39032397abc1f9647e0d6e..a5db88a4c85f9016736bbfbd3d118b471d0b239d 100644 (file)
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -889,7 +889,7 @@ 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) && numBytesRead == 0) {
+            if (feof(srcFile) && numBytesRead == 0 && info->compressedSize > 0) {
                 break;
             }
             else if (feof(srcFile)) {

diff --git a/tests/playTests.sh b/tests/playTests.sh
index 7792a5690b6e062fa77aa202124d30e96a43e0af..21f79c715ee02b585b2ed894ee100d307f4afb02 100755 (executable)
--- a/tests/playTests.sh
+++ b/tests/playTests.sh
@@ -564,6 +564,14 @@ $ECHO "\n**** zstd --list/-l error detection tests ****"
 ! $ZSTD -lv tmp1*
 ! $ZSTD --list -v tmp2 tmp23.zst
 
+$ECHO "\n**** zstd --list/-l test with null files ****"
+./datagen -g0 > tmp5
+$ZSTD tmp5
+! $ZSTD -l tmp5*
+! $ZSTD -lv tmp5*
+! $ZSTD --list tmp5*
+! $ZSTD --list -v tmp5*
+
 rm tmp*
 
 if [ "$1" != "--test-large-data" ]; then