| commit | 5e4f8ec543bf75a4366e2ada461c4b44a318d0ce | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Sat May 02 02:12:27 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 02 02:12:27 2020 +0000 |
| tree | 45158d9a0f6ccd6ea809076c01e43de4b83d31d1 | |
| parent | ce2e7384ddfe18611fd0c9d1ac24709a9e409ae9 [diff] | |
| parent | ab878811b173309ee2311317c26150da9becb37a [diff] |
Merge "Fix out of memory error" into rvc-dev am: c78db3777e am: ab878811b1 Change-Id: Iaecac2ce1a3fc0f3703e11bcca21c3bba3eb52d1
diff --git a/media/libstagefright/mpeg2ts/ESQueue.cpp b/media/libstagefright/mpeg2ts/ESQueue.cpp index 657144c..4bb21fa 100644 --- a/media/libstagefright/mpeg2ts/ESQueue.cpp +++ b/media/libstagefright/mpeg2ts/ESQueue.cpp
@@ -1153,7 +1153,7 @@ } const RangeInfo &info = *mRangeInfos.begin(); - if (mBuffer->size() < info.mLength) { + if (info.mLength == 0 || mBuffer->size() < info.mLength) { return NULL; }