commit ffffa5eeb07ad42af768f78ec8cd7b44655873ab
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri May 31 21:12:36 2019 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri May 31 21:12:36 2019 +0000
tree 218d76420eac9666353037b65b417df9c2e33cce
parent 9c3040568536ffbc416f39202d723c18715a9ad2
parent 188e94625dfe42f2e963259b3eb1329f1a14c2d3

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

Change-Id: Ibfa7dfde9c015b0b019e5307585ae9807d22c7f4

media/libstagefright/httplive/HTTPDownloader.cpp

diff --git a/media/libstagefright/httplive/HTTPDownloader.cpp b/media/libstagefright/httplive/HTTPDownloader.cpp
index 793695a..9d40d3e 100644
--- a/media/libstagefright/httplive/HTTPDownloader.cpp
+++ b/media/libstagefright/httplive/HTTPDownloader.cpp
@@ -157,6 +157,12 @@
                  buffer->size() + bufferRemaining);
 
             sp<ABuffer> copy = new ABuffer(buffer->size() + bufferRemaining);
+            if (copy->data() == NULL) {
+                android_errorWriteLog(0x534e4554, "68399439");
+                ALOGE("not enough memory to download: requesting %zu + %zu",
+                        buffer->size(), bufferRemaining);
+                return NO_MEMORY;
+            }
             memcpy(copy->data(), buffer->data(), buffer->size());
             copy->setRange(0, buffer->size());