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

Codecs: mp4: Fix seek in files with single element in lookup_table

Browse source 
lookup_table offset shouldn't be zero terminated.
And fix possible out of bound access.

Change-Id: I212a5fcc1868a2ca519b0052b170e836276fe9de
This commit is contained in:
roman.artiukhin 2023-09-18 13:36:12 +03:00 • committed by Solomon Peachy
parent 57a47ef67a
commit a45204f5df
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/rbcodec/codecs/libm4a/m4a.c
View file

@ -181,8 +181,6 @@ unsigned int m4a_seek(demux_res_t* demux_res, stream_t* stream,
/* Find the chunk after 'sample_i'. */
for (chunk = 1; chunk < demux_res->num_lookup_table; ++chunk)
{
if (tco_tab[chunk].offset == 0)
break;
if (tco_tab[chunk].sample > sample_i)
break;
}
@ -287,12 +285,12 @@ unsigned int m4a_seek_raw(demux_res_t* demux_res, stream_t* stream,
/* We know the desired byte offset, search for the chunk right before.
* Return the associated sample to this chunk as chunk_sample. */
for (i=0; i < demux_res->num_lookup_table; ++i)
for (i = 1; i < demux_res->num_lookup_table; ++i)
{
if (demux_res->lookup_table[i].offset > file_loc)
break;
}
i = (i>0) ? i-1 : 0; /* We want the last chunk _before_ file_loc. */
--i; /* We want the last chunk _before_ file_loc. */
*lookup_table_idx = i;
chunk_sample = demux_res->lookup_table[i].sample;
new_pos = demux_res->lookup_table[i].offset;