Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-25 04:11:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed a potential segfault when reading the WAVEFORMATEX.

Browse Source
This commit is contained in:
Moritz Bunkus 2003-02-25 16:19:32 +00:00
parent 5608d6d8ab
commit 9e67e5cad2
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
avilib/avilib.c
View File

@ -1279,13 +1279,23 @@ int avi_parse_input_file(avi_t *AVI, int getIndex)
else if(lasttag == 2)
{
WAVEFORMATEX wfe;
int wfes;
memcpy(&wfe, hdrl_data + i, sizeof(WAVEFORMATEX));
if ((hdrl_len - i) < sizeof(WAVEFORMATEX))
wfes = hdrl_len - i;
else
wfes = sizeof(WAVEFORMATEX);
memset(&wfe, 0, sizeof(WAVEFORMATEX));
memcpy(&wfe, hdrl_data + i, wfes);
AVI->wave_format_ex[AVI->aptr] =
(WAVEFORMATEX *)malloc(sizeof(WAVEFORMATEX) + wfe.cb_size);
if (AVI->wave_format_ex[AVI->aptr] != NULL)
memcpy(AVI->wave_format_ex[AVI->aptr], hdrl_data + i,
sizeof(WAVEFORMATEX) + wfe.cb_size);
if (AVI->wave_format_ex[AVI->aptr] != NULL) {
memcpy(AVI->wave_format_ex[AVI->aptr], &wfe,
sizeof(WAVEFORMATEX));
if (wfe.cb_size > 0)
memcpy(AVI->wave_format_ex[AVI->aptr] + sizeof(WAVEFORMATEX),
hdrl_data + i + sizeof(WAVEFORMATEX), wfe.cb_size);
}
AVI->track[AVI->aptr].a_fmt = str2ushort(hdrl_data+i );