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 1014362 - Reduce the memory usage of SafeBrowsing updates. r=mmc

Browse Source
This commit is contained in:
Gian-Carlo Pascutto 2014-05-23 23:40:40 +02:00
parent 7933c029d2
commit eb9b45ebca
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp
View File

@ -142,38 +142,33 @@ nsUrlClassifierPrefixSet::GetPrefixes(uint32_t* aCount,
NS_ENSURE_ARG_POINTER(aPrefixes); NS_ENSURE_ARG_POINTER(aPrefixes);
*aPrefixes = nullptr; *aPrefixes = nullptr;
nsTArray<uint32_t> aArray; uint32_t itemCount = mIndexStarts.Length() + mDeltas.Length();
uint32_t prefixLength = mIndexPrefixes.Length(); uint32_t* prefixArray = static_cast<uint32_t*>(nsMemory::Alloc(itemCount * sizeof(uint32_t)));
NS_ENSURE_TRUE(prefixArray, NS_ERROR_OUT_OF_MEMORY);
for (uint32_t i = 0; i < prefixLength; i++) { uint32_t prefixIdxLength = mIndexPrefixes.Length();
uint32_t prefixCnt = 0;
for (uint32_t i = 0; i < prefixIdxLength; i++) {
uint32_t prefix = mIndexPrefixes[i]; uint32_t prefix = mIndexPrefixes[i];
uint32_t start = mIndexStarts[i]; uint32_t start = mIndexStarts[i];
uint32_t end = (i == (prefixLength - 1)) ? mDeltas.Length() uint32_t end = (i == (prefixIdxLength - 1)) ? mDeltas.Length()
: mIndexStarts[i + 1]; : mIndexStarts[i + 1];
if (end > mDeltas.Length()) { if (end > mDeltas.Length()) {
return NS_ERROR_FILE_CORRUPTED; return NS_ERROR_FILE_CORRUPTED;
} }
aArray.AppendElement(prefix); prefixArray[prefixCnt++] = prefix;
for (uint32_t j = start; j < end; j++) { for (uint32_t j = start; j < end; j++) {
prefix += mDeltas[j]; prefix += mDeltas[j];
aArray.AppendElement(prefix); prefixArray[prefixCnt++] = prefix;
} }
} }
NS_ASSERTION(mIndexStarts.Length() + mDeltas.Length() == aArray.Length(), NS_ASSERTION(itemCount == prefixCnt, "Lengths are inconsistent");
"Lengths are inconsistent");
uint32_t itemCount = aArray.Length();
uint32_t* retval = static_cast<uint32_t*>(nsMemory::Alloc(itemCount * sizeof(uint32_t)));
NS_ENSURE_TRUE(retval, NS_ERROR_OUT_OF_MEMORY);
for (uint32_t i = 0; i < itemCount; i++) {
retval[i] = aArray[i];
}
*aCount = itemCount; *aCount = itemCount;
*aPrefixes = retval; *aPrefixes = prefixArray;
return NS_OK; return NS_OK;
} }