| commit | 047b025120cce1b82d94be6a4606a8133237f548 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Wed Aug 10 10:30:07 2016 -0700 |
| committer | gitbuildkicker <android-build@google.com> | Mon Aug 15 16:41:30 2016 -0700 |
| tree | a9ff7de7295ba1b20672afa0a6d91b644b299c83 | |
| parent | 3b92080d8c895fe5786966ef25a8264e78c01743 [diff] |
stagefright: handle NULL format after convertMetaDataToMessage Bug: 30421366 Change-Id: I411f9f22b39943f7c8fa4e22fc37efe5f9e0ccb5
diff --git a/media/libmediaplayerservice/nuplayer/StreamingSource.cpp b/media/libmediaplayerservice/nuplayer/StreamingSource.cpp index c4147e1..a7c5cf4 100644 --- a/media/libmediaplayerservice/nuplayer/StreamingSource.cpp +++ b/media/libmediaplayerservice/nuplayer/StreamingSource.cpp
@@ -229,7 +229,8 @@ sp<MetaData> meta = source->getFormat(); status_t err = convertMetaDataToMessage(meta, &format); - if (err != OK) { + if (err != OK) { // format may have been cleared on error + format = new AMessage; format->setInt32("err", err); } return format;
diff --git a/media/libstagefright/SimpleDecodingSource.cpp b/media/libstagefright/SimpleDecodingSource.cpp index 1b44a00..de21c5e 100644 --- a/media/libstagefright/SimpleDecodingSource.cpp +++ b/media/libstagefright/SimpleDecodingSource.cpp
@@ -43,7 +43,9 @@ CHECK(meta->findCString(kKeyMIMEType, &mime)); sp<AMessage> format = new AMessage; - convertMetaDataToMessage(source->getFormat(), &format); + if (convertMetaDataToMessage(source->getFormat(), &format) != OK) { + return NULL; + } Vector<AString> matchingCodecs; MediaCodecList::findMatchingCodecs(