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

Commit 6652cc6a authored by mtk28629's avatar mtk28629 Committed by Lajos Molnar
Browse files

codec2: BufferPoolClient: fix NPE in fetchBufferHandle if connection is null 

Do a null pointer check before connection->fetch().

Bug: 344846184
Flag: EXEMPT bugfix
Test:
1.atest android.media.decoder.cts.AdaptivePlaybackTest
2.atest android.media.decoder.cts.DecoderTest

Change-Id: I30031b4abf46f920b708320ffa3fa9d1598027b4
parent 922c0325

media/bufferpool/aidl/default/BufferPoolClient.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -748,6 +748,10 @@ BufferPoolStatus BufferPoolClient::Impl::fetchBufferHandle( 
    } else {

    } else {

        connection = mRemoteConnection;

        connection = mRemoteConnection;

    }

    }

    if (!connection) {

        ALOGE("connection null: fetchBufferHandle()");

        return ResultStatus::CRITICAL_ERROR;

    }

    std::vector<FetchInfo> infos;

    std::vector<FetchInfo> infos;

    std::vector<FetchResult> results;

    std::vector<FetchResult> results;

    infos.emplace_back(FetchInfo{ToAidl(transactionId), ToAidl(bufferId)});

    infos.emplace_back(FetchInfo{ToAidl(transactionId), ToAidl(bufferId)});