| commit | d6b115b76ce3331dcd136663fc747c7f634904be | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Fri Dec 01 16:12:08 2017 -0800 |
| committer | android-build-team Robot <android-build-team-robot@google.com> | Thu Feb 22 19:32:32 2018 +0000 |
| tree | 027e653ecb1ca2b85066a2db6ba15b97a9d70948 | |
| parent | 09586601f7e05ce1e8cb13408eace8c1093882ca [diff] |
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)
diff --git a/media/libstagefright/httplive/M3UParser.cpp b/media/libstagefright/httplive/M3UParser.cpp index c04549a..78a2dd0 100644 --- a/media/libstagefright/httplive/M3UParser.cpp +++ b/media/libstagefright/httplive/M3UParser.cpp
@@ -897,6 +897,9 @@ } } + if (meta->get() == NULL) { + return ERROR_MALFORMED; + } return OK; }