If zstd fails, give a more specific failure massage, fix #109

mcmilk · Apr 14, 2020 · 773a12c · 773a12c
1 parent d2845a6
commit 773a12c
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 6 deletions.
diff --git a/CPP/7zip/Compress/ZstdDecoder.cpp b/CPP/7zip/Compress/ZstdDecoder.cpp
@@ -1,4 +1,4 @@
-// (C) 2016 - 2018 Tino Reichardt
+// (C) 2016 - 2020 Tino Reichardt
 
 #define DEBUG 0
 
@@ -110,8 +110,22 @@ HRESULT CDecoder::CodeSpec(ISequentialInStream * inStream,
       zOut.pos = 0;
 
       result = ZSTD_decompressStream(_ctx, &zOut, &zIn);
-      if (ZSTD_isError(result))
-        return E_FAIL;
+      if (ZSTD_isError(result)) {
+        switch (ZSTD_getErrorCode(result)) {
+          /* @Igor: would be nice, if we have an API to store the errmsg */
+          case ZSTD_error_memory_allocation:
+            return E_OUTOFMEMORY;
+          case ZSTD_error_version_unsupported:
+          case ZSTD_error_frameParameter_unsupported:
+            return E_NOTIMP;
+          case ZSTD_error_frameParameter_windowTooLarge:
+          case ZSTD_error_parameter_unsupported:
+          case ZSTD_error_parameter_outOfBound:
+            return E_INVALIDARG;
+          default:
+            return E_FAIL;
+        }
+      }
 
 #if DEBUG
       printf("res       = %u\n", (unsigned)result);

diff --git a/CPP/7zip/Compress/ZstdEncoder.cpp b/CPP/7zip/Compress/ZstdEncoder.cpp
@@ -1,8 +1,8 @@
-// (C) 2016 - 2018 Tino Reichardt
+// (C) 2016 - 2020 Tino Reichardt
 
 #define DEBUG 0
 
-#if DEBUG
+#if 0
 #include <stdio.h>
 #endif
 
@@ -349,7 +349,22 @@ STDMETHODIMP CEncoder::Code(ISequentialInStream *inStream,
       }
 
       err = ZSTD_compressStream2(_ctx, &outBuff, &inBuff, ZSTD_todo);
-      if (ZSTD_isError(err)) return E_FAIL;
+      if (ZSTD_isError(err)) {
+        switch (ZSTD_getErrorCode(err)) {
+          /* @Igor: would be nice, if we have an API to store the errmsg */
+          case ZSTD_error_memory_allocation:
+            return E_OUTOFMEMORY;
+          case ZSTD_error_version_unsupported:
+          case ZSTD_error_frameParameter_unsupported:
+            return E_NOTIMP;
+          case ZSTD_error_frameParameter_windowTooLarge:
+          case ZSTD_error_parameter_unsupported:
+          case ZSTD_error_parameter_outOfBound:
+            return E_INVALIDARG;
+          default:
+            return E_FAIL;
+        }
+      }
 
 #if DEBUG
       printf("err=%u ", (unsigned)err);