diff options
| author | Jaesung Chung <jaesung@google.com> | 2015-05-22 05:27:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-22 05:27:43 +0000 |
| commit | 5bb07a3bb49f6d96bd182ad0e6b36a67f306096d (patch) | |
| tree | f114115193c1f99804fb43c05f73bcdc62c8eb3d /media/libstagefright/mpeg2ts | |
| parent | 0075debd2c559904ee8a2a4e4706ed5af0abaeb9 (diff) | |
| parent | f2cecd570c35d3b6422396dd51c0b4202732bcea (diff) | |
| download | frameworks_av-5bb07a3bb49f6d96bd182ad0e6b36a67f306096d.zip frameworks_av-5bb07a3bb49f6d96bd182ad0e6b36a67f306096d.tar.gz frameworks_av-5bb07a3bb49f6d96bd182ad0e6b36a67f306096d.tar.bz2 | |
Merge "mpeg2ts: Fix SIGEGV on ATSParser::Stream::flush()" into mnc-dev
Diffstat (limited to 'media/libstagefright/mpeg2ts')
| -rw-r--r-- | media/libstagefright/mpeg2ts/ATSParser.cpp | 2 |
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; } |