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

Commit 9e2f6164 authored by Kuowei Li's avatar Kuowei Li Committed by Xiao Huang
Browse files

Fix crash when callback thread late launched after stream close. 

When stream is closed before codec format changed event be processed,
accessing all members in the stream instance is invalid and will lead to process crash.
Use weak pointer to check instance before callback to track.

Bug: 261393406
Test: manual

Change-Id: I9dafa90d4f95d24189b21c80a31baa855c58cf3e
parent 92a771e4

services/audioflinger/Threads.cpp

+8 −1
Original line number Diff line number Diff line
@@ -2908,7 +2908,14 @@ void AudioFlinger::PlaybackThread::onError() 
void AudioFlinger::PlaybackThread::onCodecFormatChanged(

        const std::basic_string<uint8_t>& metadataBs)

{

    std::thread([this, metadataBs]() {

    wp<AudioFlinger::PlaybackThread> weakPointerThis = this;

    std::thread([this, metadataBs, weakPointerThis]() {

            sp<AudioFlinger::PlaybackThread> playbackThread = weakPointerThis.promote();

            if (playbackThread == nullptr) {

                ALOGW("PlaybackThread was destroyed, skip codec format change event");

                return;

            }



            audio_utils::metadata::Data metadata =

                    audio_utils::metadata::dataFromByteString(metadataBs);

            if (metadata.empty()) {