Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1438917 - limit allocations in SkTDynamicHash. r=jrmuizel

Browse Source 
MozReview-Commit-ID: 1d3Tngi6Uek
This commit is contained in:
Lee Salzman 2018-03-19 11:56:14 -04:00
parent 0998499d37
commit f0cb87c218
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gfx/skia/skia/src/core/SkTDynamicHash.h
View File

@ -241,7 +241,8 @@ private:
}
void maybeGrow() {
if (100 * (fCount + fDeleted + 1) > fCapacity * kGrowPercent) {
if (100 * (int64_t(fCount + fDeleted) + 1) > int64_t(fCapacity) * kGrowPercent) {
SkASSERT_RELEASE(fCapacity <= std::numeric_limits<int>::max() / 2);
this->resize(fCapacity > 0 ? fCapacity * 2 : 4);
}
}
@ -253,7 +254,7 @@ private:
fCount = fDeleted = 0;
fCapacity = newCapacity;
fArray = (T**)sk_calloc_throw(sizeof(T*) * fCapacity);
fArray = (T**)sk_calloc_throw(fCapacity, sizeof(T*));
for (int i = 0; i < oldCapacity; i++) {
T* entry = oldArray[i];