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

am: ec5a0f4656

Change-Id: I14ed475a3de2342592dfe744bab3cb518dbe4c00

media/libstagefright/httplive/HTTPDownloader.cpp

@@ -157,6 +157,12 @@ ssize_t HTTPDownloader::fetchBlock(
                  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());