diff options
| author | Robert Shih <robertshih@google.com> | 2017-12-01 16:12:08 -0800 |
|---|---|---|
| committer | Ivan Kutepov <its.kutepov@gmail.com> | 2018-02-08 02:44:23 +0300 |
| commit | 122a2be9f0282f6954c12cbd4c0c6d62d33cc7f3 (patch) | |
| tree | 04390677681850f1ccde4ebc015a514854d3c0ae | |
| parent | 7eb61bf0d945e1e93da91468c6ae39532071427d (diff) | |
| download | frameworks_av-122a2be9f0282f6954c12cbd4c0c6d62d33cc7f3.tar.gz frameworks_av-122a2be9f0282f6954c12cbd4c0c6d62d33cc7f3.tar.bz2 frameworks_av-122a2be9f0282f6954c12cbd4c0c6d62d33cc7f3.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)
CVE-2017-13235
| -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 ff2bb272ed..c3a176534f 100644 --- a/media/libstagefright/httplive/M3UParser.cpp +++ b/media/libstagefright/httplive/M3UParser.cpp @@ -887,6 +887,9 @@ status_t M3UParser::parseStreamInf( } } + if (meta->get() == NULL) { + return ERROR_MALFORMED; + } return OK; } |