King_DuckZ/Loki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Bug 2684989: flex_string insert char fails with SmallStringOpt

Browse source 
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@1006 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
jfbastien 2009-03-12 12:28:58 +00:00
parent 208bbae624
commit 0174e55298
1 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
include/loki/flex/flex_string_shell.h
View file

@ -548,29 +548,27 @@ private:
Invariant checker(*this); Invariant checker(*this);
(void) checker; (void) checker;
assert(begin() <= p && p <= end()); assert(begin() <= p && p <= end());
if (capacity() - size() < n) const size_type insertOffset(p - begin());
const size_type originalSize(size());
if(n < originalSize - insertOffset)
{ {
const size_type sz = p - begin(); // The new characters fit within the original string.
reserve(size() + n); // The characters that are pushed back need to be moved because they're aliased.
p = begin() + sz; // The appended characters will all be overwritten by the move.
} append(n, value_type(0));
const iterator oldEnd = end(); value_type * begin(&*begin());
//if (p + n < oldEnd) // replaced because of crash (pk) flex_string_details::pod_move(begin + insertOffset, begin + originalSize, begin + insertOffset + n);
if( n < size_type(oldEnd - p)) std::fill(begin + insertOffset, begin + insertOffset + n, c);
{
append(oldEnd - n, oldEnd);
//std::copy(
// reverse_iterator(oldEnd - n),
// reverse_iterator(p),
// reverse_iterator(oldEnd));
flex_string_details::pod_move(&*p, &*oldEnd - n, &*p + n);
std::fill(p, p + n, c);
} }
else else
{ {
append(n - (end() - p), c); // The new characters exceed the original string.
append(p, oldEnd); // The characters that are pushed back can simply be copied since they aren't aliased.
std::fill(p, oldEnd, c); // The appended characters will partly be overwritten by the copy.
append(n, c);
value_type * begin(&*begin());
flex_string_details::pod_copy(begin + insertOffset, begin + originalSize, begin + insertOffset + n);
std::fill(begin + insertOffset, begin + originalSize, c);
} }
return *this; return *this;
} }