corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1291082 part.3 ContentCache::TextRectArray::GetUnionRectAsFarAsPossible() should avoid crash by itself r=m_kato

Browse Source 
ContentCache::TextRectArray::GetUnionRectAsFarAsPossible() should avoid crash by itself even if it's caller's bug. This makes parent process more stable, that is what one of the purpose of e10s is.

MozReview-Commit-ID: qKAfvm6eZw
This commit is contained in:
Masayuki Nakano
2016-08-17 00:15:44 +09:00
parent e534b8afb9
commit 0f0f02e59d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
widget/ContentCache.cpp
View File

@@ -1311,10 +1311,9 @@ ContentCache::TextRectArray::GetUnionRectAsFarAsPossible(
uint32_t aLength, uint32_t aLength,
bool aRoundToExistingOffset) const bool aRoundToExistingOffset) const
{ {
MOZ_ASSERT(HasRects());
LayoutDeviceIntRect rect; LayoutDeviceIntRect rect;
if (!aRoundToExistingOffset && !IsOverlappingWith(aOffset, aLength)) { if (!HasRects() ||
(!aRoundToExistingOffset && !IsOverlappingWith(aOffset, aLength))) {
return rect; return rect;
} }
uint32_t startOffset = std::max(aOffset, mStart); uint32_t startOffset = std::max(aOffset, mStart);
@@ -1325,6 +1324,9 @@ ContentCache::TextRectArray::GetUnionRectAsFarAsPossible(
if (aRoundToExistingOffset && endOffset < mStart + 1) { if (aRoundToExistingOffset && endOffset < mStart + 1) {
endOffset = mStart + 1; endOffset = mStart + 1;
} }
if (NS_WARN_IF(endOffset < startOffset)) {
return rect;
}
for (uint32_t i = 0; i < endOffset - startOffset; i++) { for (uint32_t i = 0; i < endOffset - startOffset; i++) {
rect = rect.Union(mRects[startOffset - mStart + i]); rect = rect.Union(mRects[startOffset - mStart + i]);
} }