boost/container
2
0
Fork 0
mirror of https://github.com/boostorg/container.git synced 2026-02-26 04:32:21 +00:00
Code Issues Projects Releases Wiki Activity

Fixes GitHub #75 ("flat_set: Heap overflow")

Browse Source
This commit is contained in:
Ion Gaztañaga
2018-06-26 21:50:05 +02:00
parent 920e009d71
commit e9d10ce544
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/boost/container/vector.hpp
View File

@@ -2197,11 +2197,11 @@ class vector
template<class InputIt, class Compare>
BOOST_CONTAINER_FORCEINLINE void merge_unique(InputIt first, InputIt last, Compare comp)
{
size_type const s = this->size();
size_type const old_size = this->size();
this->priv_set_difference_back(first, last, comp);
T *const raw_beg = this->priv_raw_begin();
T *const raw_end = this->priv_raw_end();
T *raw_pos = raw_beg + s;
T *raw_pos = raw_beg + old_size;
boost::movelib::adaptive_merge(raw_beg, raw_pos, raw_end, comp, raw_end, this->capacity() - this->size());
}
@@ -2278,14 +2278,14 @@ class vector
if (comp(*first1, *first2)) {
this->emplace_back(*first1);
//Reallocation happened, update range
T * const raw_begin = this->priv_raw_begin();
if(old_first2 != raw_begin){
if(old_first2 != raw_begin)
{
//Reallocation happened, update range
first2 = raw_begin + (first2 - old_first2);
last2 = first2 + (last2 - old_first2);
last2 = raw_begin + (last2 - old_first2);
old_first2 = raw_begin;
}
++first1;
}
else {