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

2018-11-20 18:22:36 +00:00
parent c1a15b81ac 13a734dc96
commit 82cf8de1f3
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});
        }
    }