summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjiabin <jiabin@google.com>2018-04-05 17:16:20 -0700
committerMSe <mse1969@posteo.de>2018-06-08 17:38:19 +0200
commit947e4ba1ceb5df5313a9f4878f8ec0fd285f9b36 (patch)
tree82acdc3f6e812d776998169e7702ccd9b6bf77f3
parentfa824d71a2df57b8de3e90e2488ade7ef132884f (diff)
downloadframeworks_av-947e4ba1ceb5df5313a9f4878f8ec0fd285f9b36.tar.gz
frameworks_av-947e4ba1ceb5df5313a9f4878f8ec0fd285f9b36.tar.bz2
frameworks_av-947e4ba1ceb5df5313a9f4878f8ec0fd285f9b36.zip
Init gain config to prevent uninit leak.
In AudioPortConfig, we only initialize index for audio_gain_config, but not other fields. That may cause uninit leak at listAudioPorts and listAudioPatches. Bug: 77238250 Bug: 77238762 Test: try repo steps at the bug description. Change-Id: I57e3bd0598f9aa698a6fa3d3c0218b046de34e2f (cherry picked from commit ebe0777edcf3b9c6bde9771d65399e2363dc6e40) CVE-2018-9345, CVE-2018-9346
-rw-r--r--services/audiopolicy/common/managerdefinitions/src/AudioPort.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/audiopolicy/common/managerdefinitions/src/AudioPort.cpp b/services/audiopolicy/common/managerdefinitions/src/AudioPort.cpp
index 4e24f19daa..169a599033 100644
--- a/services/audiopolicy/common/managerdefinitions/src/AudioPort.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/AudioPort.cpp
@@ -827,6 +827,7 @@ AudioPortConfig::AudioPortConfig()
mSamplingRate = 0;
mChannelMask = AUDIO_CHANNEL_NONE;
mFormat = AUDIO_FORMAT_INVALID;
+ memset(&mGain, 0, sizeof(struct audio_gain_config));
mGain.index = -1;
}