Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77cce80f authored by Phil Burk's avatar Phil Burk
Browse files

[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: default avatarPhil Burk <philburk@google.com>
parent b63d63b8

services/audiopolicy/AudioPolicyManager.cpp

+6 −2
Original line number Diff line number Diff line
@@ -709,7 +709,9 @@ audio_io_handle_t AudioPolicyManager::getOutputForDevice( 
            config.sample_rate = mTestSamplingRate;

            config.channel_mask = mTestChannels;

            config.format = mTestFormat;

            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;

        if (offloadInfo != NULL) {

            config.offload_info = *offloadInfo;

        }

        status = mpClientInterface->openOutput(profile->mModule->mHandle,

                                               &output,

                                               &config,