Merge remote-tracking branch 'origin/candidate-9.0.x' into candidate-…

…9.2.x Signed-off-by: Gavin Halliday <[email protected]> # Conflicts: # helm/hpcc/Chart.yaml # helm/hpcc/templates/_helpers.tpl # helm/hpcc/templates/dafilesrv.yaml # helm/hpcc/templates/dali.yaml # helm/hpcc/templates/dfuserver.yaml # helm/hpcc/templates/eclagent.yaml # helm/hpcc/templates/eclccserver.yaml # helm/hpcc/templates/eclscheduler.yaml # helm/hpcc/templates/esp.yaml # helm/hpcc/templates/localroxie.yaml # helm/hpcc/templates/roxie.yaml # helm/hpcc/templates/sasha.yaml # helm/hpcc/templates/thor.yaml # version.cmake
hpcc-systems · Jun 7, 2024 · c34b961 · c34b961
2 parents 0b8750e + 6c4f9a1
commit c34b961
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/system/jlib/jlzw.cpp b/system/jlib/jlzw.cpp
@@ -804,13 +804,10 @@ void decompressToBuffer(MemoryBuffer & out, const void * src)
 
 void decompressToBuffer(MemoryBuffer & out, MemoryBuffer & in)
 {
-    unsigned char method;
+    bool compressed;
     size32_t srcLen;
-    in.read(method).read(srcLen);
-    if (method > 1)
-        throw makeStringException(-1, "New compression format is not supported in this version");
-
-    if (method != 0)
+    in.read(compressed).read(srcLen);
+    if (compressed)
         decompressToBuffer(out, in.readDirect(srcLen));
     else
         out.append(srcLen, in.readDirect(srcLen));