Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-28 19:38:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1691831 - Clamp offsets to character count in HyperTextIterator. r=morgan

Browse Source 
I tried to come up with a good test for this, that reproduces the issue in a demonstratable way, but couldn't.

Differential Revision: https://phabricator.services.mozilla.com/D104586
This commit is contained in:
Eitan Isaacson 2021-02-10 06:58:40 +00:00
parent de41983d0d
commit 49dfc2e434
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
accessible/mac/HyperTextAccessibleWrap.mm
View File

@ -25,10 +25,17 @@ class HyperTextIterator {
HyperTextIterator(HyperTextAccessible* aStartContainer, int32_t aStartOffset,
HyperTextAccessible* aEndContainer, int32_t aEndOffset)
: mCurrentContainer(aStartContainer),
mCurrentStartOffset(aStartOffset),
mCurrentEndOffset(aStartOffset),
mCurrentStartOffset(0),
mCurrentEndOffset(0),
mEndContainer(aEndContainer),
mEndOffset(aEndOffset) {}
mEndOffset(0) {
mCurrentStartOffset =
std::min(aStartOffset,
static_cast<int32_t>(mCurrentContainer->CharacterCount()));
mCurrentEndOffset = mCurrentStartOffset;
mEndOffset = std::min(
aEndOffset, static_cast<int32_t>(mEndContainer->CharacterCount()));
}
bool Next();
@ -286,10 +293,16 @@ void HyperTextAccessibleWrap::AttributedTextForRange(
int32_t attrStartOffset = 0;
int32_t attrEndOffset = iter.mCurrentStartOffset;
do {
int32_t oldEndOffset = attrEndOffset;
nsCOMPtr<nsIPersistentProperties> props =
iter.mCurrentContainer->TextAttributes(
true, attrEndOffset, &attrStartOffset, &attrEndOffset);
if (oldEndOffset == attrEndOffset) {
MOZ_ASSERT_UNREACHABLE("new attribute end offset should be different");
break;
}
nsAutoString text;
iter.mCurrentContainer->TextSubstring(
attrStartOffset < iter.mCurrentStartOffset ? iter.mCurrentStartOffset