hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix core caused by allocate memory with size of zero

Browse Source
This commit is contained in:
Larry955
2023-05-06 08:42:28 +00:00
committed by ob-robot
parent 46c6dab725
commit 5c006e369a
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/share/stat/ob_opt_column_stat.cpp
View File

@ -296,17 +296,20 @@ int ObOptColumnStat::deep_copy(const ObOptColumnStat &src)
avg_length_ = src.avg_length_; avg_length_ = src.avg_length_;
last_analyzed_ = src.last_analyzed_; last_analyzed_ = src.last_analyzed_;
cs_type_ = src.cs_type_; cs_type_ = src.cs_type_;
llc_bitmap_size_ = src.llc_bitmap_size_;
if (OB_FAIL(ob_write_obj(allocator_, src.min_value_, min_value_))) { if (OB_FAIL(ob_write_obj(allocator_, src.min_value_, min_value_))) {
LOG_WARN("deep copy min_value_ failed.", K_(src.min_value), K(ret)); LOG_WARN("deep copy min_value_ failed.", K_(src.min_value), K(ret));
} else if (OB_FAIL(ob_write_obj(allocator_, src.max_value_, max_value_))) { } else if (OB_FAIL(ob_write_obj(allocator_, src.max_value_, max_value_))) {
LOG_WARN("deep copy max_value_ failed.", K_(src.max_value), K(ret)); LOG_WARN("deep copy max_value_ failed.", K_(src.max_value), K(ret));
} else if (OB_FAIL(histogram_.deep_copy(allocator_, src.histogram_))) { } else if (OB_FAIL(histogram_.deep_copy(allocator_, src.histogram_))) {
LOG_WARN("failed to deep copy histogram", K(ret)); LOG_WARN("failed to deep copy histogram", K(ret));
} else { } else if (src.llc_bitmap_size_ != 0 && src.llc_bitmap_ != NULL) {
void *ptr = allocator_.alloc(sizeof(char) * src.llc_bitmap_size_); if (OB_ISNULL(llc_bitmap_ = static_cast<char*>(allocator_.alloc(src.llc_bitmap_size_)))) {
llc_bitmap_ = new (ptr) char[src.llc_bitmap_size_]; ret = OB_ALLOCATE_MEMORY_FAILED;
llc_bitmap_size_ = src.llc_bitmap_size_; LOG_WARN("failed to allocate memory for llc_bitmap_");
MEMCPY(llc_bitmap_, src.llc_bitmap_, src.llc_bitmap_size_); } else {
MEMCPY(llc_bitmap_, src.llc_bitmap_, src.llc_bitmap_size_);
}
} }
} }
return ret; return ret;