Stagefright: Add Checks for allocations

Warn allocation failures explicitly rather than crash
trying to access unallocated memory

Change-Id: Ie86c3ac130917e1f4030eb8207ac8350cba7711d

3 files changed, 10 insertions, 0 deletions

diff --git a/media/libmedia/ICrypto.cpp b/media/libmedia/ICrypto.cpp
index 947294f..9f65bde 100644
--- a/media/libmedia/ICrypto.cpp
+++ b/media/libmedia/ICrypto.cpp
@@ -235,6 +235,7 @@ status_t BnCrypto::onTransact(
 
             if (opaqueSize > 0) {
                 opaqueData = malloc(opaqueSize);
+                CHECK(opaqueData != NULL);
                 data.read(opaqueData, opaqueSize);
             }
 
@@ -298,6 +299,7 @@ status_t BnCrypto::onTransact(
                 secureBufferId = reinterpret_cast<void *>(static_cast<uintptr_t>(data.readInt64()));
             } else {
                 dstPtr = malloc(totalSize);
+                CHECK(dstPtr != NULL);
             }
 
             AString errorDetailMsg;
diff --git a/media/libmedia/IEffectClient.cpp b/media/libmedia/IEffectClient.cpp
index 1322e72..531f767 100644
--- a/media/libmedia/IEffectClient.cpp
+++ b/media/libmedia/IEffectClient.cpp
@@ -22,6 +22,8 @@
 #include <sys/types.h>
 #include <media/IEffectClient.h>
 
+#include <media/stagefright/foundation/ADebug.h>
+
 namespace android {
 
 enum {
@@ -117,12 +119,14 @@ status_t BnEffectClient::onTransact(
             char *cmd = NULL;
             if (cmdSize) {
                 cmd = (char *)malloc(cmdSize);
+                CHECK(cmd != NULL);
                 data.read(cmd, cmdSize);
             }
             uint32_t replySize = data.readInt32();
             char *resp = NULL;
             if (replySize) {
                 resp = (char *)malloc(replySize);
+                CHECK(resp != NULL);
                 data.read(resp, replySize);
             }
             commandExecuted(cmdCode, cmdSize, cmd, replySize, resp);
diff --git a/media/libmedia/MediaScanner.cpp b/media/libmedia/MediaScanner.cpp
index dcbb769..dac0a9e 100644
--- a/media/libmedia/MediaScanner.cpp
+++ b/media/libmedia/MediaScanner.cpp
@@ -24,6 +24,8 @@
 #include <sys/stat.h>
 #include <dirent.h>
 
+#include <media/stagefright/foundation/ADebug.h>
+
 namespace android {
 
 MediaScanner::MediaScanner()
@@ -240,6 +242,7 @@ MediaScanResult MediaScanner::doProcessDirectoryEntry(
 MediaAlbumArt *MediaAlbumArt::clone() {
     size_t byte_size = this->size() + sizeof(MediaAlbumArt);
     MediaAlbumArt *result = reinterpret_cast<MediaAlbumArt *>(malloc(byte_size));
+    CHECK(result != NULL);
     result->mSize = this->size();
     memcpy(&result->mData[0], &this->mData[0], this->size());
     return result;
@@ -253,6 +256,7 @@ void MediaAlbumArt::init(MediaAlbumArt *instance, int32_t dataSize, const void *
 MediaAlbumArt *MediaAlbumArt::fromData(int32_t dataSize, const void* data) {
     size_t byte_size = sizeof(MediaAlbumArt) + dataSize;
     MediaAlbumArt *result = reinterpret_cast<MediaAlbumArt *>(malloc(byte_size));
+    CHECK(result != NULL);
     init(result, dataSize, data);
     return result;
 }