Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a use-after-free found by HWAsan."

Browse Source 
am: 82cf8de1f3

Change-Id: I74e90250ec2e1d90da89c16de77925044f55cb1c
This commit is contained in:
Peter Collingbourne
2018-11-20 10:45:15 -08:00
committed by android-build-merger
parent b6afff08e0 82cf8de1f3
commit 2557458766
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/hwui/pipeline/skia/SkiaMemoryTracer.cpp
View File

@@ -106,8 +106,9 @@ void SkiaMemoryTracer::processElement() {
resourceValues.insert({key, sizeResult->second}); resourceValues.insert({key, sizeResult->second});
} }
} else { } else {
TraceValue sizeValue = sizeResult->second;
mCurrentValues.clear(); mCurrentValues.clear();
mCurrentValues.insert({key, sizeResult->second}); mCurrentValues.insert({key, sizeValue});
mResults.insert({resourceName, mCurrentValues}); mResults.insert({resourceName, mCurrentValues});
} }
} }