From 03e23d111385161afc917abe21b19cf8761e0440 Mon Sep 17 00:00:00 2001 From: Andree Buschmann Date: Tue, 10 May 2011 19:04:24 +0000 Subject: Implement error handling for libfaad's memory allocation. Do not allocate PS related types dynamically anymore to minimize code changes. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29854 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/libfaad/decoder.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'apps/codecs/libfaad/decoder.c') diff --git a/apps/codecs/libfaad/decoder.c b/apps/codecs/libfaad/decoder.c index 05d7885..caedda7 100644 --- a/apps/codecs/libfaad/decoder.c +++ b/apps/codecs/libfaad/decoder.c @@ -346,6 +346,11 @@ int32_t NEAACDECAPI NeAACDecInit(NeAACDecHandle hDecoder, uint8_t *buffer, hDecoder->time_out[i] = s_time_buf_2048[i]; #else hDecoder->time_out[i] = (real_t*)faad_malloc(2*FRAME_LEN*sizeof(real_t)); + if (hDecoder->time_out[i] == NULL) + { + /* could not allocate memory */ + return -1; + } #endif memset(hDecoder->time_out[i], 0, 2*FRAME_LEN); hDecoder->sbr_alloced[hDecoder->fr_ch_ele] = 1; @@ -469,6 +474,11 @@ int8_t NEAACDECAPI NeAACDecInit2(NeAACDecHandle hDecoder, uint8_t *pBuffer, hDecoder->time_out[i] = s_time_buf_2048[i]; #else hDecoder->time_out[i] = (real_t*)faad_malloc(2*FRAME_LEN*sizeof(real_t)); + if (hDecoder->time_out[i] == NULL) + { + /* could not allocate memory */ + return -1; + } #endif memset(hDecoder->time_out[i], 0, 2*FRAME_LEN); hDecoder->sbr_alloced[hDecoder->fr_ch_ele] = 1; -- cgit v1.1