From 6de382cdbb37f06bbf3b06810311ce9e8bc56e30 Mon Sep 17 00:00:00 2001
From: Chip Turner <cturner@pattern.net>
Date: Sun, 13 Mar 2016 22:24:46 -0700
Subject: [PATCH 1/3] propagate errors when decompressing; also unlink dstfile
 if we create it but fail to successfully compress or decompress

---
 programs/fileio.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/programs/fileio.c b/programs/fileio.c
index 028c7db4..25d75b62 100644
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -428,6 +428,10 @@ static int FIO_compressFilename_extRess(cRess_t ress,
 
     result = FIO_compressFilename_internal(ress, dstFileName, srcFileName, cLevel);
 
+    if (result != 0) {
+      unlink(dstFileName);
+    }
+
     fclose(ress.srcFile);   /* no pb to expect : only reading */
     if (fclose(ress.dstFile)) EXM_THROW(28, "Write error : cannot properly close %s", dstFileName);
     return result;
@@ -633,13 +637,17 @@ static int FIO_decompressSrcFile(dRess_t ress, const char* srcFileName)
 static int FIO_decompressFile_extRess(dRess_t ress,
                                       const char* dstFileName, const char* srcFileName)
 {
+    int result;
     ress.dstFile = FIO_openDstFile(dstFileName);
     if (ress.dstFile==0) return 1;
 
-    FIO_decompressSrcFile(ress, srcFileName);
+    result = FIO_decompressSrcFile(ress, srcFileName);
+    if (result != 0) {
+      unlink(dstFileName);
+    }
 
     if (fclose(ress.dstFile)) EXM_THROW(38, "Write error : cannot properly close %s", dstFileName);
-    return 0;
+    return result;
 }
 
 

From 9da7f865913756d5ee413e48d6636073f13b8a99 Mon Sep 17 00:00:00 2001
From: Chip Turner <cturner@pattern.net>
Date: Mon, 14 Mar 2016 07:44:59 -0700
Subject: [PATCH 2/3] use remove instead of unlink

---
 programs/fileio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/programs/fileio.c b/programs/fileio.c
index 25d75b62..8f26a4c3 100644
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -429,7 +429,7 @@ static int FIO_compressFilename_extRess(cRess_t ress,
     result = FIO_compressFilename_internal(ress, dstFileName, srcFileName, cLevel);
 
     if (result != 0) {
-      unlink(dstFileName);
+      remove(dstFileName);
     }
 
     fclose(ress.srcFile);   /* no pb to expect : only reading */
@@ -643,7 +643,7 @@ static int FIO_decompressFile_extRess(dRess_t ress,
 
     result = FIO_decompressSrcFile(ress, srcFileName);
     if (result != 0) {
-      unlink(dstFileName);
+      remove(dstFileName);
     }
 
     if (fclose(ress.dstFile)) EXM_THROW(38, "Write error : cannot properly close %s", dstFileName);

From 97406c9b2cb01946f3d2f08d954d28820f1d011a Mon Sep 17 00:00:00 2001
From: Yann Collet <yann.collet.73@gmail.com>
Date: Mon, 14 Mar 2016 17:05:40 +0100
Subject: [PATCH 3/3] Added test to check decompression error return code

---
 programs/playTests.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/programs/playTests.sh b/programs/playTests.sh
index ec625ee8..891ab9d4 100755
--- a/programs/playTests.sh
+++ b/programs/playTests.sh
@@ -36,7 +36,10 @@ $ZSTD --decompress tmpCompressed --stdout > tmpResult
 $ZSTD -q tmp && die "overwrite check failed!"
 $ZSTD -q -f tmp
 $ZSTD -q --force tmp
-
+$ZSTD -df tmp && die "should have refused : wrong extension"
+cp tmp tmp2.zst
+$ZSTD -df tmp2.zst && die "should have failed : wrong format"
+rm tmp2.zst
 
 echo "\n**** frame concatenation **** "