Merge pull request ClickHouse#84320 from scanhex12/yet_another_fix

alexey-milovidov · web-flow · commit 313e9c54b2d9 · 2025-07-24T04:10:33.000+02:00
Yet another sz3 fuzzer compression fix
diff --git a/src/Compression/CompressionCodecSZ3.cpp b/src/Compression/CompressionCodecSZ3.cpp
@@ -153,7 +153,8 @@ UInt32 CompressionCodecSZ3::doCompressData(const char * source, UInt32 source_si
     size_t compressed_size;
     switch (float_width)
     {
-        case 4: {
+        case 4:
+        {
             try
             {
                 compressed.reset(SZ_compress(config, reinterpret_cast<const float *>(source), compressed_size));
@@ -164,7 +165,8 @@ UInt32 CompressionCodecSZ3::doCompressData(const char * source, UInt32 source_si
             }
             break;
         }
-        case 8: {
+        case 8:
+        {
             try
             {
                 compressed.reset(SZ_compress(config, reinterpret_cast<const double *>(source), compressed_size));
@@ -196,8 +198,10 @@ void CompressionCodecSZ3::setAndCheckVectorDimension(size_t dimension_)
 
 void CompressionCodecSZ3::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 /*uncompressed_size*/) const
 {
-    if (source_size == 0)
-        throw Exception(ErrorCodes::CORRUPTED_DATA, "Can not decompress empty data");
+    //github.com/ Hardcoded, because it is not declared (we just calculated the minimal size of decompressed config) and it is less than sizeof(SZ3::Config).
+    static constexpr const size_t config_size = 39;
+    if (source_size < 1 + config_size)
+        throw Exception(ErrorCodes::CORRUPTED_DATA, "Can not decompress data {} that is less than minimal size of compressed", source_size);
 
     UInt8 width = static_cast<UInt8>(*source);
     --source_size;
@@ -206,7 +210,8 @@ void CompressionCodecSZ3::doDecompressData(const char * source, UInt32 source_si
     SZ3::Config config;
     switch (width)
     {
-        case 4: {
+        case 4:
+        {
             try
             {
                 float * dest_typed = reinterpret_cast<float *>(dest);
@@ -218,7 +223,8 @@ void CompressionCodecSZ3::doDecompressData(const char * source, UInt32 source_si
             }
             break;
         }
-        case 8: {
+        case 8:
+        {
             try
             {
                 double * dest_typed = reinterpret_cast<double *>(dest);

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,8 @@ UInt32 CompressionCodecSZ3::doCompressData(const char * source, UInt32 source_si`
`153`	`153`	`size_t compressed_size;`
`154`	`154`	`switch (float_width)`
`155`	`155`	`{`
`156`		`- case 4: {`
	`156`	`+ case 4:`
	`157`	`+ {`
`157`	`158`	`try`
`158`	`159`	`{`
`159`	`160`	`compressed.reset(SZ_compress(config, reinterpret_cast<const float *>(source), compressed_size));`
`@@ -164,7 +165,8 @@ UInt32 CompressionCodecSZ3::doCompressData(const char * source, UInt32 source_si`
`164`	`165`	`}`
`165`	`166`	`break;`
`166`	`167`	`}`
`167`		`- case 8: {`
	`168`	`+ case 8:`
	`169`	`+ {`
`168`	`170`	`try`
`169`	`171`	`{`
`170`	`172`	`compressed.reset(SZ_compress(config, reinterpret_cast<const double *>(source), compressed_size));`
`@@ -196,8 +198,10 @@ void CompressionCodecSZ3::setAndCheckVectorDimension(size_t dimension_)`
`196`	`198`
`197`	`199`	`void CompressionCodecSZ3::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 /uncompressed_size/) const`
`198`	`200`	`{`
`199`		`- if (source_size == 0)`
`200`		`- throw Exception(ErrorCodes::CORRUPTED_DATA, "Can not decompress empty data");`
	`201`	`+ /// Hardcoded, because it is not declared (we just calculated the minimal size of decompressed config) and it is less than sizeof(SZ3::Config).`
	`202`	`+ static constexpr const size_t config_size = 39;`
	`203`	`+ if (source_size < 1 + config_size)`
	`204`	`+ throw Exception(ErrorCodes::CORRUPTED_DATA, "Can not decompress data {} that is less than minimal size of compressed", source_size);`
`201`	`205`
`202`	`206`	`UInt8 width = static_cast<UInt8>(*source);`
`203`	`207`	`--source_size;`
`@@ -206,7 +210,8 @@ void CompressionCodecSZ3::doDecompressData(const char * source, UInt32 source_si`
`206`	`210`	`SZ3::Config config;`
`207`	`211`	`switch (width)`
`208`	`212`	`{`
`209`		`- case 4: {`
	`213`	`+ case 4:`
	`214`	`+ {`
`210`	`215`	`try`
`211`	`216`	`{`
`212`	`217`	`float * dest_typed = reinterpret_cast<float *>(dest);`
`@@ -218,7 +223,8 @@ void CompressionCodecSZ3::doDecompressData(const char * source, UInt32 source_si`
`218`	`223`	`}`
`219`	`224`	`break;`
`220`	`225`	`}`
`221`		`- case 8: {`
	`226`	`+ case 8:`
	`227`	`+ {`
`222`	`228`	`try`
`223`	`229`	`{`
`224`	`230`	`double * dest_typed = reinterpret_cast<double *>(dest);`