commit e46c142ad59284a4f6e64984dac6d4aba00f4276
author Robert Shih <robertshih@google.com> Wed Jun 05 13:55:37 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jun 05 13:55:37 2019 -0700
tree 813a9c343a0f6c509e19f867e0c321ec2134a3d2
parent e44b6c7854e8e9b4a0d45317becbb5a02db60544
parent ec5a0f46569a50ce51cb0fd189ac4a47d7d90c16

Merge changes from topic "am-b39caaa3-4861-4759-a55f-8e0eb691097b" into oc-dev
am: ec5a0f4656

Change-Id: I14ed475a3de2342592dfe744bab3cb518dbe4c00

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());