Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-17 08:30:06 +02:00
Code Issues Releases Wiki Activity

Add some defensive code in libmad to fix crash opening a corrupt .mp2

Browse Source
This commit is contained in:
Paul Licameli 2015-12-20 19:50:27 -05:00
parent b5f2046286
commit 85026f9895
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib-src/libmad/layer3.c
View File

@ -2632,9 +2632,14 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame)
assert(stream->md_len + md_len - assert(stream->md_len + md_len -
si.main_data_begin <= MAD_BUFFER_MDLEN); si.main_data_begin <= MAD_BUFFER_MDLEN);
int nCopy = md_len - si.main_data_begin;
if (nCopy > MAD_BUFFER_MDLEN - stream->md_len)
// PRL defend against an observed violation of the assertion above
nCopy = MAD_BUFFER_MDLEN - stream->md_len;
memcpy(*stream->main_data + stream->md_len, memcpy(*stream->main_data + stream->md_len,
mad_bit_nextbyte(&stream->ptr), mad_bit_nextbyte(&stream->ptr),
frame_used = md_len - si.main_data_begin); frame_used = nCopy);
stream->md_len += frame_used; stream->md_len += frame_used;
} }
} }