Merge pull request #60 from amondonedo/master

Updated LZ4 version 1.9.2
ClickHouse · Jan 9, 2021 · 9d8b99d · 9d8b99d
2 parents d070906 + 86fddbb
commit 9d8b99d
Show file tree

Hide file tree

Showing 7 changed files with 3,942 additions and 1,580 deletions.
diff --git a/clickhouse/base/compressed.cpp b/clickhouse/base/compressed.cpp
@@ -85,7 +85,7 @@ bool CompressedInput::Decompress() {
 
         data_ = Buffer(original);
 
-        if (LZ4_decompress_fast((const char*)tmp.data() + 9, (char*)data_.data(), original) < 0) {
+        if (LZ4_decompress_safe((const char*)tmp.data() + 9, (char*)data_.data(), compressed - 9, original) < 0) {
             throw std::runtime_error("can't decompress data");
         } else {
             mem_.Reset(data_.data(), original);

diff --git a/clickhouse/client.cpp b/clickhouse/client.cpp
@@ -671,7 +671,7 @@ void Client::Impl::SendData(const Block& block) {
                 buf.resize(9 + LZ4_compressBound(tmp.size()));
 
                 // Compress data
-                int size = LZ4_compress((const char*)tmp.data(), (char*)buf.data() + 9, tmp.size());
+                int size = LZ4_compress_default((const char*)tmp.data(), (char*)buf.data() + 9, tmp.size(), buf.size() - 9);
                 buf.resize(9 + size);
 
                 // Fill header

diff --git a/contrib/lz4/LICENSE b/contrib/lz4/LICENSE
@@ -1,5 +1,5 @@
 LZ4 Library
-Copyright (c) 2011-2014, Yann Collet
+Copyright (c) 2011-2016, Yann Collet
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,