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 --- services/audiopolicy/service/AudioPolicyEffects.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'services/audiopolicy/service/AudioPolicyEffects.h') diff --git a/services/audiopolicy/service/AudioPolicyEffects.h b/services/audiopolicy/service/AudioPolicyEffects.h index 3dec437..3845050 100644 --- a/services/audiopolicy/service/AudioPolicyEffects.h +++ b/services/audiopolicy/service/AudioPolicyEffects.h @@ -27,6 +27,8 @@ #include #include +#include + namespace android { // ---------------------------------------------------------------------------- @@ -102,6 +104,7 @@ private: ((origParam->psize + 3) & ~3) + ((origParam->vsize + 3) & ~3); effect_param_t *dupParam = (effect_param_t *) malloc(origSize); + CHECK(dupParam != NULL); memcpy(dupParam, origParam, origSize); // This works because the param buffer allocation is also done by // multiples of 4 bytes originally. In theory we should memcpy only -- cgit v1.1