commit | ed5b0b00f9b7114781294eb37827b98bd1e78a6d | [log] [tgz] |
---|---|---|
author | Robert Shih <robertshih@google.com> | Fri Dec 01 16:12:08 2017 -0800 |
committer | Ryan Longair <rlongair@google.com> | Thu Dec 14 13:28:09 2017 -0800 |
tree | 07b68bf115d167cd93a9602e8341d7e0faa85304 | |
parent | c7850da2d93777653a7afb25d289ffcbf5865d46 [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; }