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

Commit d76f0c9f authored by Chad Brubaker's avatar Chad Brubaker Committed by Android Git Automerger
Browse files

am 230fc5a9: am e89f6562: Merge "Fix benign unsigned integer overflows" 

* commit '230fc5a9':
  Fix benign unsigned integer overflows
parents e0f22d3c 230fc5a9

media/libstagefright/httplive/PlaylistFetcher.cpp

+4 −2
Original line number Diff line number Diff line
@@ -1683,7 +1683,8 @@ status_t PlaylistFetcher::extractAndQueueAccessUnitsFromTs(const sp<ABuffer> &bu 
    }



    status_t err = OK;

    for (size_t i = mPacketSources.size(); i-- > 0;) {

    for (size_t i = mPacketSources.size(); i > 0;) {

        i--;

        sp<AnotherPacketSource> packetSource = mPacketSources.valueAt(i);



        const LiveSession::StreamType stream = mPacketSources.keyAt(i);
@@ -1807,7 +1808,8 @@ status_t PlaylistFetcher::extractAndQueueAccessUnitsFromTs(const sp<ABuffer> &bu 
    }



    if (err != OK) {

        for (size_t i = mPacketSources.size(); i-- > 0;) {

        for (size_t i = mPacketSources.size(); i > 0;) {

            i--;

            sp<AnotherPacketSource> packetSource = mPacketSources.valueAt(i);

            packetSource->clear();

        }