summaryrefslogtreecommitdiffstats
path: root/mfbt
diff options
context:
space:
mode:
authorAlex Gaynor <agaynor@mozilla.com>2018-05-22 13:04:59 -0400
committerwolfbeast <mcwerewolf@gmail.com>2018-06-29 07:59:58 +0200
commitffbe05e06776f7e7e7233e74578312781888a249 (patch)
tree51445084435d753aa7c80ca538294ee689848117 /mfbt
parent8ed2f59cc5f07299dfedc658283eb0ea4b49e08c (diff)
downloadUXP-ffbe05e06776f7e7e7233e74578312781888a249.tar
UXP-ffbe05e06776f7e7e7233e74578312781888a249.tar.gz
UXP-ffbe05e06776f7e7e7233e74578312781888a249.tar.lz
UXP-ffbe05e06776f7e7e7233e74578312781888a249.tar.xz
UXP-ffbe05e06776f7e7e7233e74578312781888a249.zip
Bug 1462912 - Fixed BufferList::Extract to handle the case where the call consumes the entirety of the BufferList. r=froydnj, a=RyanVM
Diffstat (limited to 'mfbt')
-rw-r--r--mfbt/BufferList.h9
-rw-r--r--mfbt/tests/TestBufferList.cpp12
2 files changed, 20 insertions, 1 deletions
diff --git a/mfbt/BufferList.h b/mfbt/BufferList.h
index aaff31454..7faf5a2ae 100644
--- a/mfbt/BufferList.h
+++ b/mfbt/BufferList.h
@@ -532,7 +532,14 @@ BufferList<AllocPolicy>::Extract(IterImpl& aIter, size_t aSize, bool* aSuccess)
mSegments[aIter.mSegment].mCapacity));
aIter.Advance(*this, aIter.RemainingInSegment());
}
- MOZ_RELEASE_ASSERT(aIter.mSegment == copyStart + segmentsToCopy);
+ // Due to the way IterImpl works, there are two cases here: (1) if we've
+ // consumed the entirety of the BufferList, then the iterator is pointed at
+ // the end of the final segment, (2) otherwise it is pointed at the start
+ // of the next segment. We want to verify that we really consumed all
+ // |segmentsToCopy| segments.
+ MOZ_RELEASE_ASSERT(
+ (aIter.mSegment == copyStart + segmentsToCopy) ||
+ (aIter.Done() && aIter.mSegment == copyStart + segmentsToCopy - 1));
mSegments.erase(mSegments.begin() + copyStart,
mSegments.begin() + copyStart + segmentsToCopy);
diff --git a/mfbt/tests/TestBufferList.cpp b/mfbt/tests/TestBufferList.cpp
index 207fa106f..325f8a3aa 100644
--- a/mfbt/tests/TestBufferList.cpp
+++ b/mfbt/tests/TestBufferList.cpp
@@ -279,5 +279,17 @@ int main(void)
MOZ_RELEASE_ASSERT(bl9.Size() == 8);
MOZ_RELEASE_ASSERT(!iter.Done());
+ BufferList bl10(0, 0, 8);
+ bl10.WriteBytes("abcdefgh", 8);
+ bl10.WriteBytes("12345678", 8);
+ iter = bl10.Iter();
+ BufferList bl11 = bl10.Extract(iter, 16, &success);
+ MOZ_RELEASE_ASSERT(success);
+ MOZ_RELEASE_ASSERT(bl11.Size() == 16);
+ MOZ_RELEASE_ASSERT(iter.Done());
+ iter = bl11.Iter();
+ MOZ_RELEASE_ASSERT(bl11.ReadBytes(iter, data, 16));
+ MOZ_RELEASE_ASSERT(memcmp(data, "abcdefgh12345678", 16) == 0);
+
return 0;
}