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

Commit fa02dd1e authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "MPEG4Writer:Fix MetaData use-after-free issue" am: e6b6db59 am: 2308ec5e 

Change-Id: Ia23a044765cdfe27f1d244897a8625b15b85d5a6
parents 9d4867f6 2308ec5e

media/libstagefright/MPEG4Writer.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -614,7 +614,8 @@ status_t MPEG4Writer::addSource(const sp<MediaSource> &source) { 
    CHECK(source.get() != NULL);

    CHECK(source.get() != NULL);





    const char *mime;

    const char *mime;

    source->getFormat()->findCString(kKeyMIMEType, &mime);

    sp<MetaData> meta = source->getFormat();

    meta->findCString(kKeyMIMEType, &mime);





    if (Track::getFourCCForMime(mime) == NULL) {

    if (Track::getFourCCForMime(mime) == NULL) {

        ALOGE("Unsupported mime '%s'", mime);

        ALOGE("Unsupported mime '%s'", mime);