From 4d0485d7daead3a28cac12c2e2cea25c2ade654d Mon Sep 17 00:00:00 2001
From: SathishKumar Mani <smani@codeaurora.org>
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/MPEG4Extractor.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'media/libstagefright/MPEG4Extractor.cpp')

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 84e07b5..cd50365 100755
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -535,6 +535,7 @@ status_t MPEG4Extractor::readMetaData() {
     }
     if (psshsize > 0 && psshsize <= UINT32_MAX) {
         char *buf = (char*)malloc(psshsize);
+        CHECK(buf != NULL);
         char *ptr = buf;
         for (size_t i = 0; i < mPssh.size(); i++) {
             memcpy(ptr, mPssh[i].uuid, 20); // uuid + length
-- 
cgit v1.1