wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 609691 - check result of gfxFontGroup::MakeTextRun for failure. r=karlt a=joe

Browse Source
This commit is contained in:
Jonathan Kew 2010-12-01 11:53:45 +00:00
parent 22fbb53ff3
commit 73e737410a
1 changed files with 64 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
gfx/thebes/gfxTextRunWordCache.cpp
View File

@ -452,22 +452,29 @@ TextRunWordCache::FinishTextRun(gfxTextRun *aTextRun, gfxTextRun *aNewRun,
}
// If the word starts inside a cluster we don't want this word
// in the cache, so we'll remove the associated cache entry
PRBool wordStartsInsideCluster =
PRBool wordStartsInsideCluster;
PRBool wordStartsInsideLigature;
if (aSuccessful) {
wordStartsInsideCluster =
!source->IsClusterStart(word->mSourceOffset);
PRBool wordStartsInsideLigature =
wordStartsInsideLigature =
!source->IsLigatureGroupStart(word->mSourceOffset);
}
if (source == aNewRun) {
// We created a cache entry for this word based on the assumption
// that the word matches GetFontAt(0). If this assumption is false,
// we need to remove that cache entry and replace it with an entry
// keyed off the fontgroup.
PRBool rekeyWithFontGroup =
GetWordFontOrGroup(aNewRun, word->mSourceOffset, word->mLength) != font && !useFontGroup;
if (!aSuccessful || rekeyWithFontGroup ||
wordStartsInsideCluster || wordStartsInsideLigature) {
PRBool removeFontKey = !aSuccessful ||
wordStartsInsideCluster || wordStartsInsideLigature ||
(!useFontGroup && font != GetWordFontOrGroup(aNewRun,
word->mSourceOffset,
word->mLength));
if (removeFontKey) {
// We need to remove the current placeholder cache entry
CacheHashKey key(aTextRun, (useFontGroup ? (void*)fontGroup : (void*)font), word->mDestOffset, word->mLength,
word->mHash);
CacheHashKey key(aTextRun,
(useFontGroup ? (void*)fontGroup : (void*)font),
word->mDestOffset, word->mLength, word->mHash);
NS_ASSERTION(mCache.GetEntry(key),
"This entry should have been added previously!");
mCache.RemoveEntry(key);
@ -525,9 +532,20 @@ TextRunWordCache::FinishTextRun(gfxTextRun *aTextRun, gfxTextRun *aNewRun,
tmpTextRun = aNewRun->GetFontGroup()->MakeTextRun(
source->GetTextUnicode() + sourceOffset, length, aParams,
aNewRun->GetFlags());
if (tmpTextRun) {
source = tmpTextRun;
sourceOffset = 0;
stealData = PR_TRUE;
} else {
// If we failed to create the temporary run (OOM),
// skip the word, as if aSuccessful had been FALSE.
// (In practice this is only likely to occur if
// we're on the verge of an OOM crash anyhow.
// But ignoring gfxFontGroup::MakeTextRun() failure
// is bad because it means we'd be using an invalid
// source pointer.)
continue;
}
}
}
aTextRun->CopyGlyphDataFrom(source, sourceOffset, length,
@ -638,11 +656,23 @@ TextRunWordCache::MakeTextRun(const PRUnichar *aText, PRUint32 aLength,
aFontGroup->MakeTextRun(numString.get(), length, aParams,
aFlags & ~(gfxTextRunFactory::TEXT_IS_PERSISTENT |
gfxTextRunFactory::TEXT_IS_8BIT));
// If MakeTextRun failed, numRun will be null, which is bad...
// we'll just pretend there wasn't a digit to process.
// This means we won't have the correct numerals, but at least
// we're not trying to copy glyph data from an invalid source.
// In practice it's unlikely to happen unless we're very close
// to crashing due to OOM.
if (numRun) {
DeferredWord word = { numRun, 0, wordStart, length, hash };
deferredWords.AppendElement(word);
transientRuns.AppendElement(numRun);
seenDigitToModify = PR_FALSE;
} else {
seenDigitToModify = PR_FALSE;
}
}
if (!seenDigitToModify) {
// didn't need to modify digits (or failed to do so)
PRBool hit = LookupWord(textRun, font, wordStart, i, hash,
deferredWords.Length() == 0 ? nsnull : &deferredWords);
if (!hit) {
@ -667,7 +697,10 @@ TextRunWordCache::MakeTextRun(const PRUnichar *aText, PRUint32 aLength,
} // else we should set this character to be invisible missing,
// but it already is because the textrun is blank!
}
} else {
seenDigitToModify = PR_FALSE;
}
hash = 0;
wordStart = i + 1;
} else {
@ -762,11 +795,16 @@ TextRunWordCache::MakeTextRun(const PRUint8 *aText, PRUint32 aLength,
aFontGroup->MakeTextRun(numString.get(), length, aParams,
aFlags & ~(gfxTextRunFactory::TEXT_IS_PERSISTENT |
gfxTextRunFactory::TEXT_IS_8BIT));
if (numRun) {
DeferredWord word = { numRun, 0, wordStart, length, hash };
deferredWords.AppendElement(word);
transientRuns.AppendElement(numRun);
seenDigitToModify = PR_FALSE;
} else {
seenDigitToModify = PR_FALSE;
}
}
if (!seenDigitToModify) {
PRBool hit = LookupWord(textRun, font, wordStart, i, hash,
deferredWords.Length() == 0 ? nsnull : &deferredWords);
if (!hit) {
@ -791,7 +829,10 @@ TextRunWordCache::MakeTextRun(const PRUint8 *aText, PRUint32 aLength,
} // else we should set this character to be invisible missing,
// but it already is because the textrun is blank!
}
} else {
seenDigitToModify = PR_FALSE;
}
hash = 0;
wordStart = i + 1;
} else {