| commit | abda279d1efc2c7e6e7b888cb94e1853c8116f5b | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Wed Dec 06 00:01:05 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 06 00:01:05 2017 +0000 |
| tree | 690d9e6f77e30405ab38502239097fec82a68ddb | |
| parent | 6b113667ac119c947905d92c7b0d1da74354f468 [diff] | |
| parent | 169d852fb1b901ae80df3e6b5cde3354555bb79d [diff] |
Merge "httplive: check for malformed EXT-X-STREAM-INF" into lmp-mr1-dev am: 3c8977e928 am: ed16f7be35 am: eed6cda723 am: 6063b798dc am: 114d28791d am: a08c4a5a6f am: 169d852fb1 Change-Id: I294032c9480c34a40d9f4f817848eaec17c10fbb
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; }