summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/mpeg2ts
diff options
context:
space:
mode:
authorJaesung Chung <jaesung@google.com>2015-05-21 14:23:07 +0900
committerJaesung Chung <jaesung@google.com>2015-05-22 13:48:19 +0900
commitf2cecd570c35d3b6422396dd51c0b4202732bcea (patch)
tree28cba1d821f61c01d0640b42a328a6bac6fa05e5 /media/libstagefright/mpeg2ts
parent4a98dab613da4d9bc9b93da9de43a815da49febc (diff)
downloadframeworks_av-f2cecd570c35d3b6422396dd51c0b4202732bcea.zip
frameworks_av-f2cecd570c35d3b6422396dd51c0b4202732bcea.tar.gz
frameworks_av-f2cecd570c35d3b6422396dd51c0b4202732bcea.tar.bz2
mpeg2ts: Fix SIGEGV on ATSParser::Stream::flush()
Bug: 21340130 Change-Id: I4c7eeaf1e35a93400adc87af4eea1902d89d2630
Diffstat (limited to 'media/libstagefright/mpeg2ts')
-rw-r--r--media/libstagefright/mpeg2ts/ATSParser.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/mpeg2ts/ATSParser.cpp b/media/libstagefright/mpeg2ts/ATSParser.cpp
index 98d2877..53423ec 100644
--- a/media/libstagefright/mpeg2ts/ATSParser.cpp
+++ b/media/libstagefright/mpeg2ts/ATSParser.cpp
@@ -1032,7 +1032,7 @@ status_t ATSParser::Stream::parsePES(ABitReader *br, SyncEvent *event) {
}
status_t ATSParser::Stream::flush(SyncEvent *event) {
- if (mBuffer->size() == 0) {
+ if (mBuffer == NULL || mBuffer->size() == 0) {
return OK;
}