From 886978345873693db3d13c48b6e97802cf7be03b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 27 Jul 2025 07:54:23 +0800
Subject: [PATCH] branch-2.1: [fix](be) core dump because of invalid bitmap
 data #53088 (#53935)

Cherry-picked from #53088

Co-authored-by: JinYang <130516674+gohalo@users.noreply.github.com>
---
 be/src/util/bitmap_value.h         | 7 ++++++-
 be/test/util/bitmap_value_test.cpp | 6 ++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/be/src/util/bitmap_value.h b/be/src/util/bitmap_value.h
index 0b8fccd277..c0de276858 100644
--- a/be/src/util/bitmap_value.h
+++ b/be/src/util/bitmap_value.h
@@ -1908,7 +1908,12 @@ public:
         case BitmapTypeCode::BITMAP64_V2:
             _type = BITMAP;
             _is_shared = false;
-            _bitmap = std::make_shared<detail::Roaring64Map>(detail::Roaring64Map::read(src));
+            try {
+                _bitmap = std::make_shared<detail::Roaring64Map>(detail::Roaring64Map::read(src));
+            } catch (const std::runtime_error& e) {
+                LOG(ERROR) << "Decode roaring bitmap failed, " << e.what();
+                return false;
+            }
             break;
         case BitmapTypeCode::SET: {
             _type = SET;
diff --git a/be/test/util/bitmap_value_test.cpp b/be/test/util/bitmap_value_test.cpp
index 2c08161450..74980ee909 100644
--- a/be/test/util/bitmap_value_test.cpp
+++ b/be/test/util/bitmap_value_test.cpp
@@ -1188,4 +1188,10 @@ TEST(BitmapValueTest, bitmap_value_iterator_test) {
         }
     }
 }
+
+TEST(BitmapValueTest, invalid_data) {
+    BitmapValue bitmap;
+    char data[] = {0x02, static_cast<char>(0xff), 0x03};
+    EXPECT_FALSE(bitmap.deserialize(data));
+}
 } // namespace doris