fixed asan warning

facebook · Dec 18, 2015 · 6a45835 · 6a45835
1 parent 17d188f
commit 6a45835
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/programs/playTests.sh b/programs/playTests.sh
@@ -39,9 +39,12 @@ echo frame concatenation test completed
 
 echo "**** flush write error test **** "
 
+echo "echo foo | $ZSTD > /dev/full"
 echo foo | $ZSTD > /dev/full && die "write error not detected!"
+echo "echo foo | $ZSTD | $ZSTD -d > /dev/full"
 echo foo | $ZSTD | $ZSTD -d > /dev/full && die "write error not detected!"
 
+
 echo "*** dictionary tests *** "
 
 ./datagen > tmpDict

diff --git a/programs/zstdcli.c b/programs/zstdcli.c
@@ -192,7 +192,7 @@ int main(int argCount, const char** argv)
 
     /* init */
     (void)rangeBench;   /* not used when ZSTD_NOBENCH set */
-    filenameTable = (const char**)malloc(argCount * sizeof(const char*));
+    filenameTable = (const char**)malloc(argCount * sizeof(const char*));   /* argCount >= 1 */
     if (filenameTable==NULL) { DISPLAY("not enough memory\n"); exit(1); }
     memset(filenameTable, 0, argCount * sizeof(const char*));
     displayOut = stderr;
@@ -359,7 +359,7 @@ int main(int argCount, const char** argv)
     if (!strcmp(filenameTable[0], stdinmark) && IS_CONSOLE(stdin) ) return badusage(programName);
 
     /* No output filename ==> try to select one automatically (when possible) */
-    outFileName = filenameTable[1];
+    if (filenameIdx>=2) outFileName = filenameTable[1];
     while (!outFileName)   /* while : just to allow break statement */
     {
         if (!IS_CONSOLE(stdout)) { outFileName=stdoutmark; break; }   /* Default to stdout whenever possible (i.e. not a console) */