diff options
author | Robert Shih <robertshih@google.com> | 2018-02-09 12:19:35 -0800 |
---|---|---|
committer | Tim Schumacher <timschumi@gmx.de> | 2018-04-06 19:00:11 +0200 |
commit | c37b251739f9559d4f6bcaa680b985f9cf8ff766 (patch) | |
tree | e0700419c4599296119ab5f82cb381206bf299a4 | |
parent | 4a768c974ec980a59866ecb55eee2c219cd17779 (diff) | |
download | frameworks_av-c37b251739f9559d4f6bcaa680b985f9cf8ff766.tar.gz frameworks_av-c37b251739f9559d4f6bcaa680b985f9cf8ff766.tar.bz2 frameworks_av-c37b251739f9559d4f6bcaa680b985f9cf8ff766.zip |
M3UParser: detect variant streams without EXT-X-STREAM-INF
Bug: 68399439
Change-Id: I95207b40f23a5f927da7154f9a952046118b5cad
(cherry picked from commit f3e0afb82f104d6e9986779ba2cf548c6aab1092)
-rw-r--r-- | media/libstagefright/httplive/M3UParser.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/media/libstagefright/httplive/M3UParser.cpp b/media/libstagefright/httplive/M3UParser.cpp index c3a176534f..7b5e7d5920 100644 --- a/media/libstagefright/httplive/M3UParser.cpp +++ b/media/libstagefright/httplive/M3UParser.cpp @@ -655,10 +655,13 @@ status_t M3UParser::parse(const void *_data, size_t size) { } if (!line.startsWith("#")) { + if (itemMeta == NULL) { + ALOGV("itemMeta == NULL"); + return ERROR_MALFORMED; + } if (!mIsVariantPlaylist) { int64_t durationUs; - if (itemMeta == NULL - || !itemMeta->findInt64("durationUs", &durationUs)) { + if (!itemMeta->findInt64("durationUs", &durationUs)) { return ERROR_MALFORMED; } itemMeta->setInt32("discontinuity-sequence", |