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

Commit b8f5d50c authored by Wei Jia's avatar Wei Jia Committed by Android Git Automerger
Browse files

am 3674abc0: am fb0d63df: am 62d89908: am df68d9d5: am 60b25aa0: am 9ab9c85e:... 

am 3674abc0: am fb0d63df: am 62d89908: am df68d9d5: am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into klp-dev

* commit '3674abc0':
  MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
parents 8b3aa04a 3674abc0

media/libstagefright/MPEG4Extractor.cpp

+6 −0
Original line number Diff line number Diff line
@@ -2355,6 +2355,12 @@ status_t MPEG4Extractor::parseITunesMetaData(off64_t offset, size_t size) { 
                    mLastCommentName.setTo((const char *)buffer + 4);

                    break;

                case FOURCC('d', 'a', 't', 'a'):

                    if (size < 8) {

                        delete[] buffer;

                        buffer = NULL;

                        ALOGE("b/24346430");

                        return ERROR_MALFORMED;

                    }

                    mLastCommentData.setTo((const char *)buffer + 8);

                    break;

            }