This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 9ec54e9eb52 [Fix](Serde-2.1) fix potential mem leak in array serde
write_one_cell_to_json (#41339)
9ec54e9eb52 is described below
commit 9ec54e9eb5228be0ff5f8200e8eed8150141a78b
Author: lihangyu <[email protected]>
AuthorDate: Thu Sep 26 22:49:34 2024 +0800
[Fix](Serde-2.1) fix potential mem leak in array serde
write_one_cell_to_json (#41339)
placement new may lead to mem leak in Field without calling it's
desctructor
---
.../vec/data_types/serde/data_type_array_serde.cpp | 30 ++++++++++++----------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/be/src/vec/data_types/serde/data_type_array_serde.cpp
b/be/src/vec/data_types/serde/data_type_array_serde.cpp
index e8eea4affe7..7828ecd4c69 100644
--- a/be/src/vec/data_types/serde/data_type_array_serde.cpp
+++ b/be/src/vec/data_types/serde/data_type_array_serde.cpp
@@ -229,20 +229,24 @@ void DataTypeArraySerDe::write_one_cell_to_jsonb(const
IColumn& column, JsonbWri
Status DataTypeArraySerDe::write_one_cell_to_json(const IColumn& column,
rapidjson::Value& result,
rapidjson::Document::AllocatorType& allocator,
Arena& mem_pool, int
row_num) const {
- // Use allocator instead of stack memory, since rapidjson hold the
reference of String value
- // otherwise causes stack use after free
- auto& column_array = static_cast<const ColumnArray&>(column);
- if (row_num > column_array.size()) {
- return Status::InternalError("row num {} out of range {}!", row_num,
column_array.size());
- }
- // void* mem = allocator.Malloc(sizeof(vectorized::Field));
- void* mem = mem_pool.alloc(sizeof(vectorized::Field));
- if (!mem) {
- return Status::InternalError("Malloc failed");
- }
- vectorized::Field* array = new (mem)
vectorized::Field(column_array[row_num]);
+ auto res = check_column_const_set_readability(column, row_num);
+ ColumnPtr ptr = res.first;
+ row_num = res.second;
+
+ const auto& data_column = assert_cast<const ColumnArray&>(*ptr);
+ const auto& offsets = data_column.get_offsets();
+
+ size_t offset = offsets[row_num - 1];
+ size_t next_offset = offsets[row_num];
- convert_field_to_rapidjson(*array, result, allocator);
+ const IColumn& nested_column = data_column.get_data();
+ result.SetArray();
+ for (size_t i = offset; i < next_offset; ++i) {
+ rapidjson::Value val;
+ RETURN_IF_ERROR(
+ nested_serde->write_one_cell_to_json(nested_column, val,
allocator, mem_pool, i));
+ result.PushBack(val, allocator);
+ }
return Status::OK();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
