From 4d0485d7daead3a28cac12c2e2cea25c2ade654d Mon Sep 17 00:00:00 2001 From: SathishKumar Mani Date: Fri, 25 Sep 2015 18:17:46 -0700 Subject: Stagefright: Add Checks for allocations Warn allocation failures explicitly rather than crash trying to access unallocated memory Change-Id: Ie86c3ac130917e1f4030eb8207ac8350cba7711d --- media/libstagefright/foundation/ABuffer.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'media/libstagefright/foundation/ABuffer.cpp') diff --git a/media/libstagefright/foundation/ABuffer.cpp b/media/libstagefright/foundation/ABuffer.cpp index a5b81a8..3ebbbd9 100644 --- a/media/libstagefright/foundation/ABuffer.cpp +++ b/media/libstagefright/foundation/ABuffer.cpp @@ -29,13 +29,9 @@ ABuffer::ABuffer(size_t capacity) mInt32Data(0), mOwnsData(true) { mData = malloc(capacity); - if (mData == NULL) { - mCapacity = 0; - mRangeLength = 0; - } else { - mCapacity = capacity; - mRangeLength = capacity; - } + CHECK(mData != NULL); + mCapacity = capacity; + mRangeLength = capacity; } ABuffer::ABuffer(void *data, size_t capacity) -- cgit v1.1