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

Commit 6d5a0de5 authored by Robert Shih's avatar Robert Shih Committed by Android Git Automerger
Browse files

am 46eee08a: am c9a3ea62: am b70b09c9: Merge "OMXCodec: fix potential OOB read... 

am 46eee08a: am c9a3ea62: am b70b09c9: Merge "OMXCodec: fix potential OOB read in parseHEVCCodecSpecificData"

* commit '46eee08a':
  OMXCodec: fix potential OOB read in parseHEVCCodecSpecificData
parents d9705f14 46eee08a

media/libstagefright/OMXCodec.cpp

+4 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ status_t OMXCodec::parseHEVCCodecSpecificData( 
    const uint8_t *ptr = (const uint8_t *)data;



    // verify minimum size and configurationVersion == 1.

    if (size < 7 || ptr[0] != 1) {

    if (size < 23 || ptr[0] != 1) {

        return ERROR_MALFORMED;

    }
@@ -408,6 +408,9 @@ status_t OMXCodec::parseHEVCCodecSpecificData( 
    size -= 1;

    size_t j = 0, i = 0;

    for (i = 0; i < numofArrays; i++) {

        if (size < 3) {

            return ERROR_MALFORMED;

        }

        ptr += 1;

        size -= 1;