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

Commit 6d8d823e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Really fix end-of-stream handling in OggExtractor"

parents 227b9446 36e45afe

media/extractors/ogg/OggExtractor.cpp

+4 −4
Original line number Diff line number Diff line
@@ -515,10 +515,10 @@ ssize_t MyOggExtractor::readPage(off64_t offset, Page *page) { 
        ALOGV("failed to read %zu bytes at offset %#016llx, got %zd bytes",

                sizeof(header), (long long)offset, n);



        if (n < 0) {

            return n;

        } else if (n == 0) {

        if (n == 0 || n == ERROR_END_OF_STREAM) {

            return AMEDIA_ERROR_END_OF_STREAM;

        } else if (n < 0) {

            return AMEDIA_ERROR_UNKNOWN;

        } else {

            return AMEDIA_ERROR_IO;

        }
@@ -872,7 +872,7 @@ media_status_t MyOggExtractor::_readNextPacket(MediaBufferHelper **out, bool cal 


            ALOGV("readPage returned %zd", n);



            return n < 0 ? (media_status_t) n : AMEDIA_ERROR_END_OF_STREAM;

            return (media_status_t) n;

        }



        // Prevent a harmless unsigned integer overflow by clamping to 0