commit b49c39c8f3a9b33ad52174a08ee235f357e67e17
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 fe39688528e3ed6eb8b32498c884bc4242753579
parent 851e22d1dc89a7f708b9d2b56947f69cd1a08b94
parent f3808d3a2e8c646d5edad451a80daa61a4e5d836

Merge "httplive: detect oom if playlist is infinite" into nyc-dev

media/libstagefright/httplive/HTTPDownloader.cpp

diff --git a/media/libstagefright/httplive/HTTPDownloader.cpp b/media/libstagefright/httplive/HTTPDownloader.cpp
index 861b85a..5d6634e 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());