From: Yann Collet <yann.collet.73@gmail.com>
Date: Tue, 26 Jul 2016 15:13:58 +0000 (+0200)
Subject: multi-files -t doesn't stop after detecting magic number read failure
X-Git-Tag: v0.8.0^2~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbd557d5c21536387ea7d3dc9f18033d851f16c8;p=thirdparty%2Fzstd.git

multi-files -t doesn't stop after detecting magic number read failure
---

diff --git a/programs/fileio.c b/programs/fileio.c
index ee5efa9e3..33a5c4d36 100644
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -698,11 +698,11 @@ static int FIO_decompressSrcFile(dRess_t ress, const char* srcFileName)
         size_t const toRead = 4;
         size_t const sizeCheck = fread(ress.srcBuffer, (size_t)1, toRead, srcFile);
         if (sizeCheck==0) {
-            if (readSomething==0) { DISPLAY("zstd: %s: unexpected end of file\n", srcFileName); return 1; }  /* srcFileName is empty */
+            if (readSomething==0) { DISPLAY("zstd: %s: unexpected end of file \n", srcFileName); fclose(srcFile); return 1; }  /* srcFileName is empty */
             break;   /* no more input */
         }
         readSomething = 1;
-        if (sizeCheck != toRead) EXM_THROW(31, "zstd: %s read error : cannot read header", srcFileName);
+        if (sizeCheck != toRead) { DISPLAY("zstd: %s: unknown header \n", srcFileName); fclose(srcFile); return 1; }  /* srcFileName is empty */
         {   U32 const magic = MEM_readLE32(ress.srcBuffer);
 #if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT>=1)
             if (ZSTD_isLegacy(ress.srcBuffer, 4)) {