diff options
| author | Leena Winterrowd <lenhardw@codeaurora.org> | 2015-01-29 08:31:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 08:31:43 +0000 |
| commit | c1626c8352d0256baa195e5eb804e37c3fd05560 (patch) | |
| tree | da6922f4ad603de1eff8515f3cf9ad9ade43e250 /media/libstagefright/httplive | |
| parent | ea5c0286e8a18e71608e6c6e5758b167fe0d6c26 (diff) | |
| parent | 2899991eb8ca8ebe5da7acd74e0b3bd9743a8724 (diff) | |
| download | frameworks_av-c1626c8352d0256baa195e5eb804e37c3fd05560.zip frameworks_av-c1626c8352d0256baa195e5eb804e37c3fd05560.tar.gz frameworks_av-c1626c8352d0256baa195e5eb804e37c3fd05560.tar.bz2 | |
am 2899991e: am 5cf91c50: libstagefright: httplive: Add NULL check for empty playlist
* commit '2899991eb8ca8ebe5da7acd74e0b3bd9743a8724':
libstagefright: httplive: Add NULL check for empty playlist
Diffstat (limited to 'media/libstagefright/httplive')
| -rw-r--r-- | media/libstagefright/httplive/PlaylistFetcher.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/media/libstagefright/httplive/PlaylistFetcher.cpp b/media/libstagefright/httplive/PlaylistFetcher.cpp index c0c7ed9..1a21f3c 100644 --- a/media/libstagefright/httplive/PlaylistFetcher.cpp +++ b/media/libstagefright/httplive/PlaylistFetcher.cpp @@ -609,7 +609,12 @@ void PlaylistFetcher::onMonitorQueue() { int32_t targetDurationSecs; int64_t targetDurationUs = kMinBufferedDurationUs; if (mPlaylist != NULL) { - CHECK(mPlaylist->meta()->findInt32("target-duration", &targetDurationSecs)); + if (mPlaylist->meta() == NULL || !mPlaylist->meta()->findInt32( + "target-duration", &targetDurationSecs)) { + ALOGE("Playlist is missing required EXT-X-TARGETDURATION tag"); + notifyError(ERROR_MALFORMED); + return; + } targetDurationUs = targetDurationSecs * 1000000ll; } |