commit 43df80574a6d4f8e33d755b777ef8566e736761c
author Stan Iliev <stani@google.com> Fri Mar 30 22:39:25 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 30 22:39:25 2018 +0000
tree 6d59d8d0e02de604706337431c68cf6ed84860fa
parent d6020f7bc1454aad0244533fe67a09da777eca17
parent d00eedd25b026ead6dc59044fb25d9aa4b5406b2

Merge "Fix memory leak in ShaderCache" into pi-dev am: e275d0bc19
am: d00eedd25b

Change-Id: If8311555a24baaef993cf4d757f44af8a156bfd6

libs/hwui/pipeline/skia/ShaderCache.cpp

diff --git a/libs/hwui/pipeline/skia/ShaderCache.cpp b/libs/hwui/pipeline/skia/ShaderCache.cpp
index 2fa56f6..6700748 100644
--- a/libs/hwui/pipeline/skia/ShaderCache.cpp
+++ b/libs/hwui/pipeline/skia/ShaderCache.cpp
@@ -83,10 +83,12 @@
     int maxTries = 3;
     while (valueSize > mObservedBlobValueSize && maxTries > 0) {
         mObservedBlobValueSize = std::min(valueSize, maxValueSize);
-        valueBuffer = realloc(valueBuffer, mObservedBlobValueSize);
-        if (!valueBuffer) {
+        void *newValueBuffer = realloc(valueBuffer, mObservedBlobValueSize);
+        if (!newValueBuffer) {
+            free(valueBuffer);
             return nullptr;
         }
+        valueBuffer = newValueBuffer;
         valueSize = bc->get(key.data(), keySize, valueBuffer, mObservedBlobValueSize);
         maxTries--;
     }