commit e6b6db59fc08589f0cd2f6daa643253e375463ea
author Ray Essick <essick@google.com> Thu Feb 06 04:28:55 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 06 04:28:55 2020 +0000
tree a8881d25caf03899c40cc04b1016c53e1faeccc3
parent b1bac93a5298d1f6b62302b3b2d8e70220296c89
parent 68b5a37d2779fd3325ce7ff9dc21fbd060276ecd

Merge "MPEG4Writer:Fix MetaData use-after-free issue"

media/libstagefright/MPEG4Writer.cpp

diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index f130c9b..128ce8b 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -614,7 +614,8 @@
     CHECK(source.get() != NULL);
 
     const char *mime;
-    source->getFormat()->findCString(kKeyMIMEType, &mime);
+    sp<MetaData> meta = source->getFormat();
+    meta->findCString(kKeyMIMEType, &mime);
 
     if (Track::getFourCCForMime(mime) == NULL) {
         ALOGE("Unsupported mime '%s'", mime);