wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-23 07:37:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

[layout] Always check against fragment length in nsTextFrame

Browse source
This commit is contained in:
Moonchild 2023-12-20 13:19:00 +01:00 • committed by roytam1
commit 8fe53f59d0
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
layout/generic/nsTextFrame.cpp
View file

@ -711,7 +711,11 @@ GlyphObserver::NotifyGlyphsChanged()
int32_t nsTextFrame::GetContentEnd() const { int32_t nsTextFrame::GetContentEnd() const {
nsTextFrame* next = static_cast<nsTextFrame*>(GetNextContinuation()); nsTextFrame* next = static_cast<nsTextFrame*>(GetNextContinuation());
return next ? next->GetContentOffset() : mContent->GetText()->GetLength(); // In case of allocation failure when setting/modifying the textfragment,
// it's possible our text might be missing. So we check the fragment length,
// in addition to the offset of the next continuation (if any).
int32_t fragLen = mContent->GetText()->GetLength();
return next ? std::min(fragLen, next->GetContentOffset()) : fragLen;
} }
struct FlowLengthProperty { struct FlowLengthProperty {
@ -1078,8 +1082,8 @@ public:
nsIFrame* mAncestorControllingInitialBreak; nsIFrame* mAncestorControllingInitialBreak;
int32_t GetContentEnd() { int32_t GetContentEnd() {
return mEndFrame ? mEndFrame->GetContentOffset() int32_t fragLen = mStartFrame->GetContent()->GetText()->GetLength();
: mStartFrame->GetContent()->GetText()->GetLength(); return mEndFrame ? std::min(fragLen, mEndFrame->GetContentOffset()) : fragLen;
} }
}; };