commit be89013ef6658c7a3ff7e52540c2f94ddd27410c
author Robert Shih <robertshih@google.com> Wed Jun 05 14:06:36 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jun 05 14:06:36 2019 -0700
tree 318f1f82fcc5b8946c07b925ce06cd74ff798bfd
parent c17a483a1f92ae4f672846148d1011854da489d6
parent e0a91a0000f7606a22a28bb3be0921a4407c54ab

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

Change-Id: I9b665fc06301fdcb2c2e38d6f34461e334aa1749

media/libstagefright/httplive/HTTPDownloader.cpp

diff --git a/media/libstagefright/httplive/HTTPDownloader.cpp b/media/libstagefright/httplive/HTTPDownloader.cpp
index 72604e3..6c34963 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());