commit a2c8dc480a7d71a53c6d0ffb32189f04ad739522
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 07 18:19:49 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 07 18:19:49 2020 +0000
tree 8afca844d494ab9578852e3f9c1fe3ce1467f080
parent e23cbd26568fdd243d8dc6e052e664b885101688
parent 139b5728e2d5e6c409256bbaac81c60c82568448

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

Change-Id: Idac6217b6be23b138dda448f470443de28326189

services/audioflinger/Effects.cpp

diff --git a/services/audioflinger/Effects.cpp b/services/audioflinger/Effects.cpp
index ee7a6d6..641f3ec 100644
--- a/services/audioflinger/Effects.cpp
+++ b/services/audioflinger/Effects.cpp
@@ -1856,12 +1856,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;