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 969871 - Use fallible allocation for text hyphenation; r=jfkthame

Browse Source 
It seems like the sizes for these data structures can be controlled from
Web content, and we are already prepared to deal with OOM conditions,
except that we are using infallible allocations by mistake.
This commit is contained in:
Ehsan Akhgari 2014-02-08 13:10:44 -05:00
parent ef4e513fd2
commit 9f20e412a4
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/base/src/nsLineBreaker.cpp
View File

@ -302,7 +302,7 @@ nsLineBreaker::FindHyphenationPoints(nsHyphenator *aHyphenator,
uint8_t *aBreakState)
{
nsDependentSubstring string(aTextStart, aTextLimit);
nsAutoTArray<bool,200> hyphens;
AutoFallibleTArray<bool,200> hyphens;
if (NS_SUCCEEDED(aHyphenator->Hyphenate(string, hyphens))) {
for (uint32_t i = 0; i + 1 < string.Length(); ++i) {
if (hyphens[i]) {

2
intl/hyphenation/public/nsHyphenator.h
View File

@ -21,7 +21,7 @@ public:
bool IsValid();
nsresult Hyphenate(const nsAString& aText, nsTArray<bool>& aHyphens);
nsresult Hyphenate(const nsAString& aText, FallibleTArray<bool>& aHyphens);
private:
~nsHyphenator();

2
intl/hyphenation/src/nsHyphenator.cpp
View File

@ -44,7 +44,7 @@ nsHyphenator::IsValid()
nsresult
nsHyphenator::Hyphenate(const nsAString& aString,
nsTArray<bool>& aHyphens)
FallibleTArray<bool>& aHyphens)
{
if (!aHyphens.SetLength(aString.Length())) {
return NS_ERROR_OUT_OF_MEMORY;