i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RangeArray::AddRange(): Fix joining with single subsequent range

Browse Source 
When joining with a single range, firstRange would be the same as
RangeAt(endIndex - 1) and we would overwrite its offset field before
getting its end offset, thus possibly resulting in a wrong joined range
size.
This commit is contained in:
Ingo Weinhold
2013-10-25 22:54:43 +02:00
parent 2be66b5125
commit 06064b9b4f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/shared/RangeArray.h
+2 -2
View File
@@ -142,10 +142,10 @@ RangeArray<Value>::AddRange(const Value& offset, const Value& size)
// Joining is possible. We'll adjust the first affected range and remove the // Joining is possible. We'll adjust the first affected range and remove the
// others (if any). // others (if any).
endOffset = std::max(endOffset, RangeAt(endIndex - 1).EndOffset());
RangeType& firstRange = _RangeAt(index); RangeType& firstRange = _RangeAt(index);
firstRange.offset = std::min(firstRange.offset, offset); firstRange.offset = std::min(firstRange.offset, offset);
firstRange.size = std::max(endOffset, RangeAt(endIndex - 1).EndOffset()) firstRange.size = endOffset - firstRange.offset;
- firstRange.offset;;
if (index + 1 < endIndex) if (index + 1 < endIndex)
RemoveRanges(index + 1, endIndex - index - 1); RemoveRanges(index + 1, endIndex - index - 1);