Merge pull request #18707 from ghalliday/issue31956

HPCC-31956 Better error recovery when downgrading systems Reviewed-By: Richard Chapman <[email protected]> Merged-by: Gavin Halliday <[email protected]>
hpcc-systems · May 31, 2024 · 0a65a5f · 0a65a5f
2 parents 1b8e41a + f5df9cc
commit 0a65a5f
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/system/jlib/jlzw.cpp b/system/jlib/jlzw.cpp
@@ -804,10 +804,13 @@ void decompressToBuffer(MemoryBuffer & out, const void * src)
 
 void decompressToBuffer(MemoryBuffer & out, MemoryBuffer & in)
 {
-    bool compressed;
+    unsigned char method;
     size32_t srcLen;
-    in.read(compressed).read(srcLen);
-    if (compressed)
+    in.read(method).read(srcLen);
+    if (method > 1)
+        throw makeStringException(-1, "New compression format is not supported in this version");
+
+    if (method != 0)
         decompressToBuffer(out, in.readDirect(srcLen));
     else
         out.append(srcLen, in.readDirect(srcLen));