devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Remove the mallocs for the codecdata in the m4a parser and assume a maximum size of 64 bytes (see comments in source). Also clean up the alac_set_info() function a little and make it alignment-safe. We still need to remove the seektable related mallocs. Please report if any AAC or ALAC files stop playing in Rockbox after this commit - but it is not expected to cause problems.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15861 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dave Chapman 2007-12-01 01:01:35 +00:00
parent 95c117cdb8
commit aaacb7010f
3 changed files with 51 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

23
apps/codecs/libm4a/demux.c
View file

@ -150,14 +150,15 @@ static bool read_chunk_esds(qtmovie_t *qtmovie, size_t chunk_len)
/* read length */
qtmovie->res->codecdata_len = mp4ff_read_mp4_descr_length(qtmovie->stream);
qtmovie->res->codecdata = malloc(qtmovie->res->codecdata_len);
if (qtmovie->res->codecdata)
if (qtmovie->res->codecdata_len > MAX_CODECDATA_SIZE)
{
stream_read(qtmovie->stream, qtmovie->res->codecdata_len, qtmovie->res->codecdata);
} else {
qtmovie->res->codecdata_len = 0;
DEBUGF("codecdata too large (%d) in esds\n",
(int)qtmovie->res->codecdata_len);
return false;
}
stream_read(qtmovie->stream, qtmovie->res->codecdata_len, qtmovie->res->codecdata);
/* will skip the remainder of the atom */
return true;
}
@ -225,19 +226,21 @@ static bool read_chunk_stsd(qtmovie_t *qtmovie, size_t chunk_len)
/* 12 = audio format atom, 8 = padding */
qtmovie->res->codecdata_len = entry_remaining + 12 + 8;
qtmovie->res->codecdata = malloc(qtmovie->res->codecdata_len);
if (!qtmovie->res->codecdata)
if (qtmovie->res->codecdata_len > MAX_CODECDATA_SIZE)
{
DEBUGF("stsd too large\n");
return false;
DEBUGF("codecdata too large (%d) in stsd\n",
(int)qtmovie->res->codecdata_len);
}
memset(qtmovie->res->codecdata, 0, qtmovie->res->codecdata_len);
/* audio format atom */
#if 0
/* The ALAC decoder skips these bytes, so there is no need to store them,
and this code isn't endian/alignment safe */
((unsigned int*)qtmovie->res->codecdata)[0] = 0x0c000000;
((unsigned int*)qtmovie->res->codecdata)[1] = MAKEFOURCC('a','m','r','f');
((unsigned int*)qtmovie->res->codecdata)[2] = MAKEFOURCC('c','a','l','a');
#endif
stream_read(qtmovie->stream,
entry_remaining,