Fix Roaring64NavigableMap reading mismatches

ClickHouse · Jul 26, 2022 · 77f949e · 77f949e
1 parent 7dcfae5
commit 77f949e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseBitmap.java b/clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseBitmap.java
@@ -373,7 +373,7 @@ public static ClickHouseBitmap deserialize(DataInputStream in, ClickHouseDataTyp
                             "Not able to deserialize ClickHouseBitmap for too many bitmaps(>" + 0xFFFFFFFFL + ")!");
                 }
                 // read the rest
-                in.readFully(bytes, 5, len - 5);
+                in.readFully(bytes, 5, len - 8);
                 Roaring64NavigableMap b = new Roaring64NavigableMap();
                 b.deserialize(new DataInputStream(new ByteArrayInputStream(bytes)));
                 rb = ClickHouseBitmap.wrap(b, innerType);

diff --git a/clickhouse-jdbc/src/main/java/ru/yandex/clickhouse/util/ClickHouseBitmap.java b/clickhouse-jdbc/src/main/java/ru/yandex/clickhouse/util/ClickHouseBitmap.java
@@ -293,7 +293,7 @@ public static ClickHouseBitmap deserialize(DataInputStream in, ClickHouseDataTyp
                             "Not able to deserialize ClickHouseBitmap for too many bitmaps(>" + 0xFFFFFFFFL + ")!");
                 }
                 // read the rest
-                Utils.readFully(in, bytes, 5, len - 5);
+                Utils.readFully(in, bytes, 5, len - 8);
                 Roaring64NavigableMap b = new Roaring64NavigableMap();
                 b.deserialize(new DataInputStream(new ByteArrayInputStream(bytes)));
                 rb = ClickHouseBitmap.wrap(b, innerType);