commit 6f88dc4f4e71b6d54359ffa01c7521a384483810
author Andy Hung <hunga@google.com> Wed Dec 13 16:19:39 2017 -0800
committer Andy Hung <hunga@google.com> Wed Dec 13 17:01:52 2017 -0800
tree b8baa538f64f993b3ad1e4d6488e28c1bf973eb0
parent 8bdef6aa8c5a0eda695259cad75be24bfd402aaf

AudioEffect: initialize configuration in constructor

To avoid uninitialized use in setInBuffer() and setOutBuffer().

Test: simulate high uninitialized frame counts and check memory usage.
Bug: 69927864
Change-Id: I8aa68a70596bb3eaca2d4c90915f17272d90fe82

services/audioflinger/Effects.cpp

diff --git a/services/audioflinger/Effects.cpp b/services/audioflinger/Effects.cpp
index bfb0fe2..09cc852 100644
--- a/services/audioflinger/Effects.cpp
+++ b/services/audioflinger/Effects.cpp
@@ -67,7 +67,7 @@
     : mPinned(pinned),
       mThread(thread), mChain(chain), mId(id), mSessionId(sessionId),
       mDescriptor(*desc),
-      // mConfig is set by configure() and not used before then
+      // mConfig cleared in constructor body, set by configure()
       mStatus(NO_INIT), mState(IDLE),
       // mMaxDisableWaitCnt is set by configure() and not used before then
       // mDisableWaitCnt is set by process() and updateState() and not used before then
@@ -80,6 +80,11 @@
     ALOGV("Constructor %p pinned %d", this, pinned);
     int lStatus;
 
+    // clear configuration to ensure consistent initial value of buffer framecount
+    // in case buffers are associated by setInBuffer() or setOutBuffer()
+    // prior to configure().
+    memset(&mConfig, 0, sizeof(mConfig));
+
     // create effect engine from effect factory
     mStatus = -ENODEV;
     sp<AudioFlinger> audioFlinger = mAudioFlinger.promote();
@@ -578,6 +583,7 @@
             (1000 * mConfig.outputCfg.buffer.frameCount);
 
 exit:
+    // TODO: consider clearing mConfig on error.
     mStatus = status;
     ALOGVV("configure ended");
     return status;
@@ -892,6 +898,8 @@
 
 void AudioFlinger::EffectModule::setInBuffer(const sp<EffectBufferHalInterface>& buffer) {
     ALOGVV("setInBuffer %p",(&buffer));
+
+    // mConfig.inputCfg.buffer.frameCount may be zero if configure() is not called yet.
     if (buffer != 0) {
         mConfig.inputCfg.buffer.raw = buffer->audioBuffer()->raw;
         buffer->setFrameCount(mConfig.inputCfg.buffer.frameCount);
@@ -934,6 +942,8 @@
 
 void AudioFlinger::EffectModule::setOutBuffer(const sp<EffectBufferHalInterface>& buffer) {
     ALOGVV("setOutBuffer %p",(&buffer));
+
+    // mConfig.outputCfg.buffer.frameCount may be zero if configure() is not called yet.
     if (buffer != 0) {
         mConfig.outputCfg.buffer.raw = buffer->audioBuffer()->raw;
         buffer->setFrameCount(mConfig.outputCfg.buffer.frameCount);