Merge "Fix a use-after-free found by HWAsan." am: 82cf8de1f3

am: 2557458766 Change-Id: I074b3c035442466b03476dca68987981d570440b
2018-11-20 10:56:17 -08:00
parent f3fdbef997 2557458766
commit 96a4e5a412
1 changed files with 2 additions and 1 deletions
--- a/libs/hwui/pipeline/skia/SkiaMemoryTracer.cpp
+++ b/libs/hwui/pipeline/skia/SkiaMemoryTracer.cpp
@@ -106,8 +106,9 @@ void SkiaMemoryTracer::processElement() {
                resourceValues.insert({key, sizeResult->second});
            }
        } else {
+            TraceValue sizeValue = sizeResult->second;
            mCurrentValues.clear();
-            mCurrentValues.insert({key, sizeResult->second});
+            mCurrentValues.insert({key, sizeValue});
            mResults.insert({resourceName, mCurrentValues});
        }
    }