diff options
| author | Robert Shih <robertshih@google.com> | 2017-12-01 16:12:08 -0800 |
|---|---|---|
| committer | Andreas Blaesius <andi@unlegacy-android.org> | 2018-02-17 16:41:49 +0100 |
| commit | db964f56de71b5ce57ab80efd2cf66d2fd2f9683 (patch) | |
| tree | 3213a49e49e7ac757c168d41566858ae69e7d668 /media/libstagefright/httplive/M3UParser.cpp | |
| parent | f7424ab8e234b1c28d9d4d80c9d70d82f51f9e7f (diff) | |
| download | frameworks_av-db964f56de71b5ce57ab80efd2cf66d2fd2f9683.tar.gz frameworks_av-db964f56de71b5ce57ab80efd2cf66d2fd2f9683.tar.bz2 frameworks_av-db964f56de71b5ce57ab80efd2cf66d2fd2f9683.zip | |
httplive: check for malformed EXT-X-STREAM-INF
Bug: 68342866
Test: adb shell am start -a android.intent.action.VIEW -d http://localhost:1137/index.html
Change-Id: I479f9e0b7ca828d048ef88b23b4948e3c1472b3c
(cherry picked from commit e3bd8dd81e51b4d02484e7eec0d725ba9c254c68)
Diffstat (limited to 'media/libstagefright/httplive/M3UParser.cpp')
| -rw-r--r-- | media/libstagefright/httplive/M3UParser.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/httplive/M3UParser.cpp b/media/libstagefright/httplive/M3UParser.cpp index 0366e701b3..403a5da4c1 100644 --- a/media/libstagefright/httplive/M3UParser.cpp +++ b/media/libstagefright/httplive/M3UParser.cpp @@ -748,6 +748,9 @@ status_t M3UParser::parseStreamInf( } } + if (meta->get() == NULL) { + return ERROR_MALFORMED; + } return OK; } |