Stagefright: Add Checks for allocations

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

Change-Id: Ie86c3ac130917e1f4030eb8207ac8350cba7711d

3 files changed, 5 insertions, 0 deletions

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 5089bd3..c7f863b 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -2986,6 +2986,7 @@ void AudioFlinger::dumpTee(int fd, const sp<NBAIO_Source>& source, audio_io_hand
             bool firstRead = true;
 #define TEE_SINK_READ 1024                      // frames per I/O operation
             void *buffer = malloc(TEE_SINK_READ * frameSize);
+            CHECK (buffer != NULL);
             for (;;) {
                 size_t count = TEE_SINK_READ;
                 ssize_t actual = teeSource->read(buffer, count,
diff --git a/services/audioflinger/BufferProviders.cpp b/services/audioflinger/BufferProviders.cpp
index a8be206..434a514 100644
--- a/services/audioflinger/BufferProviders.cpp
+++ b/services/audioflinger/BufferProviders.cpp
@@ -24,6 +24,7 @@
 #include <media/EffectsFactoryApi.h>
 
 #include <utils/Log.h>
+#include <media/stagefright/foundation/ADebug.h>
 
 #include "Configuration.h"
 #include "BufferProviders.h"
@@ -205,6 +206,7 @@ DownmixerBufferProvider::DownmixerBufferProvider(
      const int downmixParamSize =
              sizeof(effect_param_t) + psizePadded + sizeof(downmix_type_t);
      effect_param_t * const param = (effect_param_t *) malloc(downmixParamSize);
+     CHECK(param != NULL);
      param->psize = sizeof(downmix_params_t);
      const downmix_params_t downmixParam = DOWNMIX_PARAM_TYPE;
      memcpy(param->data, &downmixParam, param->psize);
diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp
index f7da209..a45a6f8 100644
--- a/services/audioflinger/Tracks.cpp
+++ b/services/audioflinger/Tracks.cpp
@@ -24,6 +24,7 @@
 #include <math.h>
 #include <sys/syscall.h>
 #include <utils/Log.h>
+#include <media/stagefright/foundation/ADebug.h>
 
 #include <private/media/AudioTrackShared.h>
 
@@ -1771,6 +1772,7 @@ bool AudioFlinger::PlaybackThread::OutputTrack::write(void* data, uint32_t frame
             if (mBufferQueue.size() < kMaxOverFlowBuffers) {
                 pInBuffer = new Buffer;
                 pInBuffer->mBuffer = malloc(inBuffer.frameCount * mFrameSize);
+                CHECK(pInBuffer->mBuffer != NULL);
                 pInBuffer->frameCount = inBuffer.frameCount;
                 pInBuffer->raw = pInBuffer->mBuffer;
                 memcpy(pInBuffer->raw, inBuffer.raw, inBuffer.frameCount * mFrameSize);