From: Przemyslaw Skibinski <inikep@gmail.com>
Date: Wed, 25 Jan 2017 12:02:33 +0000 (+0100)
Subject: Fixed https://github.com/facebook/zstd/issues/232
X-Git-Tag: v1.1.3^2~9^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92a4dbf2e456525d7f834cf97c8f16702ec0592e;p=thirdparty%2Fzstd.git

Fixed https://github.com/facebook/zstd/issues/232
---

diff --git a/.travis.yml b/.travis.yml
index bbd775001..ba9f9965d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -170,6 +170,6 @@ matrix:
 script:
   - JOB_NUMBER=$(echo $TRAVIS_JOB_NUMBER | sed -e 's:[0-9][0-9]*\.\(.*\):\1:')
   #  dev => normal tests;  other feature branches => short tests (number > 11)
-  - if [ "$TRAVIS_BRANCH" != "master" ] && [ "$TRAVIS_BRANCH" = "dev" ] || [ "$TRAVIS_PULL_REQUEST" = "true" ] || [ $JOB_NUMBER -gt 11 ]; then sh -c "$Cmd"; fi
+  - if [ "$TRAVIS_PULL_REQUEST" = "true" ] || [ $JOB_NUMBER -gt 11 ] || [ "$TRAVIS_BRANCH" = "dev" ] && [ "$TRAVIS_BRANCH" != "master" ]; then sh -c "$Cmd"; fi
   #  master => long tests, as this is the final step towards a Release
   - if [ "$TRAVIS_BRANCH" = "master" ]; then FUZZERTEST=-T10mn sh -c "$Cmd"; fi
diff --git a/programs/fileio.c b/programs/fileio.c
index ac7dffb31..596c922f4 100644
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -414,6 +414,11 @@ static int FIO_compressFilename_srcFile(cRess_t ress,
         DISPLAYLEVEL(1, "zstd: %s is a directory -- ignored \n", srcFileName);
         return 1;
     }
+    if (!UTIL_doesFileExists(srcFileName)) {
+        DISPLAYLEVEL(1, "zstd: %s is not a regular file -- ignored \n", srcFileName);
+        return 1;
+    }
+
     ress.srcFile = FIO_openSrcFile(srcFileName);
     if (!ress.srcFile) return 1;   /* srcFile could not be opened */
 
@@ -772,6 +777,10 @@ static int FIO_decompressSrcFile(dRess_t ress, const char* dstFileName, const ch
         DISPLAYLEVEL(1, "zstd: %s is a directory -- ignored \n", srcFileName);
         return 1;
     }
+    if (!UTIL_doesFileExists(srcFileName)) {
+        DISPLAYLEVEL(1, "zstd: %s is not a regular file -- ignored \n", srcFileName);
+        return 1;
+    }
 
     srcFile = FIO_openSrcFile(srcFileName);
     if (srcFile==0) return 1;