commit 85c9f651e119efca7666f57457297cf5f6506e01
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 05 20:36:06 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 05 20:36:06 2019 +0000
tree 327e95185a27f60fb7a33b61422e2b95826e267d
parent ec9f664d7bbe5ff91e368694f004a9d3c86834d3
parent 188e94625dfe42f2e963259b3eb1329f1a14c2d3

Merge changes from topic "am-b39caaa3-4861-4759-a55f-8e0eb691097b" into nyc-mr2-dev

* changes:
  [automerger] httplive: detect oom if playlist is infinite am: f3808d3a2e am: a7a8c35d92 am: f5dcf4dca9 am: 2f3fb2626c
  [automerger] httplive: detect oom if playlist is infinite am: f3808d3a2e am: a7a8c35d92 am: f5dcf4dca9
  [automerger] httplive: detect oom if playlist is infinite am: f3808d3a2e am: a7a8c35d92
  [automerger] httplive: detect oom if playlist is infinite am: f3808d3a2e
  httplive: detect oom if playlist is infinite

media/libstagefright/timedtext/TextDescriptions.cpp

diff --git a/media/libstagefright/timedtext/TextDescriptions.cpp b/media/libstagefright/timedtext/TextDescriptions.cpp
index c762a74..83d15a2 100644
--- a/media/libstagefright/timedtext/TextDescriptions.cpp
+++ b/media/libstagefright/timedtext/TextDescriptions.cpp
@@ -383,7 +383,7 @@
         tmpData += 8;
         size_t remaining = size - 8;
 
-        if (size < chunkSize) {
+        if (chunkSize <= 8 || size < chunkSize) {
             return OK;
         }
         switch(chunkType) {