diff options
| author | Phil Burk <philburk@google.com> | 2014-08-04 16:18:15 -0700 |
|---|---|---|
| committer | Phil Burk <philburk@google.com> | 2014-08-04 16:26:05 -0700 |
| commit | 77cce80fa9d44f1e2a6bc486ad957fbbebfce3b2 (patch) | |
| tree | 8820696deea3c86f83fc7741c8750feeb8fec9f6 /services/audiopolicy | |
| parent | b63d63b8afa25694d1973988d7acdfebcd01a18d (diff) | |
| download | frameworks_av-77cce80fa9d44f1e2a6bc486ad957fbbebfce3b2.zip frameworks_av-77cce80fa9d44f1e2a6bc486ad957fbbebfce3b2.tar.gz frameworks_av-77cce80fa9d44f1e2a6bc486ad957fbbebfce3b2.tar.bz2 | |
[audio][policy] fix crash when offloadInfo is NULL
Added check for NULL pointer to avoid crash
in AudioPolicyManager when playing AC3 data.
Change-Id: Ie56788f6277be6da47d4218b1b4a6b359fce6473
Signed-off-by: Phil Burk <philburk@google.com>
Diffstat (limited to 'services/audiopolicy')
| -rw-r--r-- | services/audiopolicy/AudioPolicyManager.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/services/audiopolicy/AudioPolicyManager.cpp b/services/audiopolicy/AudioPolicyManager.cpp index 09595ff..440f5d0 100644 --- a/services/audiopolicy/AudioPolicyManager.cpp +++ b/services/audiopolicy/AudioPolicyManager.cpp @@ -709,7 +709,9 @@ audio_io_handle_t AudioPolicyManager::getOutputForDevice( config.sample_rate = mTestSamplingRate; config.channel_mask = mTestChannels; config.format = mTestFormat; - config.offload_info = *offloadInfo; + if (offloadInfo != NULL) { + config.offload_info = *offloadInfo; + } status = mpClientInterface->openOutput(0, &mTestOutputs[mCurOutput], &config, @@ -784,7 +786,9 @@ audio_io_handle_t AudioPolicyManager::getOutputForDevice( config.sample_rate = samplingRate; config.channel_mask = channelMask; config.format = format; - config.offload_info = *offloadInfo; + if (offloadInfo != NULL) { + config.offload_info = *offloadInfo; + } status = mpClientInterface->openOutput(profile->mModule->mHandle, &output, &config, |