From 08657517e1d65c788b8704eb39dffc2af43c3f25 Mon Sep 17 00:00:00 2001
From: Marco Nelissen <marcone@google.com>
Date: Fri, 1 May 2020 12:36:46 -0700
Subject: [PATCH] Fix out of memory error

A packet with size 0 would never be removed from the queue,
and thus processed over and over again.

Bug: 129282427
Test: PoC, manual
Change-Id: Ia03a2b23df555a3c8ab53aac4589cb9b0a1b45a8
---
 media/libstagefright/mpeg2ts/ESQueue.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media/libstagefright/mpeg2ts/ESQueue.cpp b/media/libstagefright/mpeg2ts/ESQueue.cpp
index 657144cc86..4bb21fa962 100644
--- a/media/libstagefright/mpeg2ts/ESQueue.cpp
+++ b/media/libstagefright/mpeg2ts/ESQueue.cpp
@@ -1153,7 +1153,7 @@ sp<ABuffer> ElementaryStreamQueue::dequeueAccessUnitAAC() {
     }
 
     const RangeInfo &info = *mRangeInfos.begin();
-    if (mBuffer->size() < info.mLength) {
+    if (info.mLength == 0 || mBuffer->size() < info.mLength) {
         return NULL;
     }