diff options
| author | Wei Jia <wjia@google.com> | 2015-09-09 09:48:34 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2015-09-28 17:08:18 -0700 |
| commit | fd45c56bc9de905f80f059ead689edbf025748c5 (patch) | |
| tree | 3bda983917b18ff7db8c89cb9c733be90233d036 /media/libmedia/IAudioPolicyService.cpp | |
| parent | f2e5350cfd164cac1220cc00cd98e97199439c6e (diff) | |
| download | frameworks_av-fd45c56bc9de905f80f059ead689edbf025748c5.zip frameworks_av-fd45c56bc9de905f80f059ead689edbf025748c5.tar.gz frameworks_av-fd45c56bc9de905f80f059ead689edbf025748c5.tar.bz2 | |
IAudioFlinger: clear config before reading it from parcel.
Bug: 23905951
Bug: 23912202
Change-Id: Id13a9d3cae2c09e7381b841e67ddfb188274d74c
Diffstat (limited to 'media/libmedia/IAudioPolicyService.cpp')
| -rw-r--r-- | media/libmedia/IAudioPolicyService.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/media/libmedia/IAudioPolicyService.cpp b/media/libmedia/IAudioPolicyService.cpp index 7e6b9fc..0cc954f 100644 --- a/media/libmedia/IAudioPolicyService.cpp +++ b/media/libmedia/IAudioPolicyService.cpp @@ -1148,8 +1148,10 @@ status_t BnAudioPolicyService::onTransact( case GET_AUDIO_PORT: { CHECK_INTERFACE(IAudioPolicyService, data, reply); - struct audio_port port; - data.read(&port, sizeof(struct audio_port)); + struct audio_port port = {}; + if (data.read(&port, sizeof(struct audio_port)) != NO_ERROR) { + ALOGE("b/23912202"); + } status_t status = getAudioPort(&port); reply->writeInt32(status); if (status == NO_ERROR) { @@ -1162,8 +1164,10 @@ status_t BnAudioPolicyService::onTransact( CHECK_INTERFACE(IAudioPolicyService, data, reply); struct audio_patch patch; data.read(&patch, sizeof(struct audio_patch)); - audio_patch_handle_t handle; - data.read(&handle, sizeof(audio_patch_handle_t)); + audio_patch_handle_t handle = {}; + if (data.read(&handle, sizeof(audio_patch_handle_t)) != NO_ERROR) { + ALOGE("b/23912202"); + } status_t status = createAudioPatch(&patch, &handle); reply->writeInt32(status); if (status == NO_ERROR) { @@ -1292,7 +1296,7 @@ status_t BnAudioPolicyService::onTransact( data.read(&source, sizeof(struct audio_port_config)); audio_attributes_t attributes; data.read(&attributes, sizeof(audio_attributes_t)); - audio_io_handle_t handle; + audio_io_handle_t handle = {}; status_t status = startAudioSource(&source, &attributes, &handle); reply->writeInt32(status); reply->writeInt32(handle); |