| commit | 169d852fb1b901ae80df3e6b5cde3354555bb79d | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Tue Dec 05 23:56:54 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Dec 05 23:56:54 2017 +0000 |
| tree | 204616784b3ebc8de3adc20f61b512569c99b811 | |
| parent | 7e0e6edb61568f25e4dae7791e1e3bcf6dc27ecd [diff] | |
| parent | a08c4a5a6f3109ac8887b98b0ef5f8fb445a0525 [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 Change-Id: I90fa25da9a913c4056fbfb9b2af0f03d311435dc
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; }