commit | d4b234898a5cce18b0bfabaec7fa26bd0dee6ef5 | [log] [tgz] |
---|---|---|
author | Robert Shih <robertshih@google.com> | Fri Dec 01 16:12:08 2017 -0800 |
committer | Nikoli Cartagena <dargeren@google.com> | Tue Jan 02 16:10:17 2018 -0800 |
tree | 101b1bee5d96bb4715133afbf6f2f6bbb05adebb | |
parent | b59bab62c895f3809873754dce5ed17bf4648515 [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 71feb9a..8a6482b 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; }