commit 5b8039a69f1923a019d2c48b5158bf837df3a11e
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 07 18:30:38 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 07 18:30:38 2020 +0000
tree 56f6f54abf1eb08a13301b22891d09e6d5d0043a
parent 9ce5404e8ee6cf247a9004500cb91bf3b8114b14
parent a2c8dc480a7d71a53c6d0ffb32189f04ad739522

Merge "effects: fix a theoretical memory leak" am: 7f4beda2de am: 139b5728e2 am: a2c8dc480a

Change-Id: I75906bf23cf7f6fcc1d48a106a5926714e1103dc

services/audioflinger/Effects.cpp

diff --git a/services/audioflinger/Effects.cpp b/services/audioflinger/Effects.cpp
index 4d37c94..1356123 100644
--- a/services/audioflinger/Effects.cpp
+++ b/services/audioflinger/Effects.cpp
@@ -1830,12 +1830,13 @@
             }
 
             // copy to local memory in case of client corruption b/32220769
-            param = (effect_param_t *)realloc(param, size);
-            if (param == NULL) {
+            auto *newParam = (effect_param_t *)realloc(param, size);
+            if (newParam == NULL) {
                 ALOGW("command(): out of memory");
                 status = NO_MEMORY;
                 break;
             }
+            param = newParam;
             memcpy(param, p, size);
 
             int reply = 0;