ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-20 21:36:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '2a187a074a7f5ad9f01f72ac9715ddfcb2dbb8ec'

Browse Source 
* commit '2a187a074a7f5ad9f01f72ac9715ddfcb2dbb8ec':
  asfdec: avoid crash in the case when chunk_len is 0 or pkt_len is 0

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-22 17:13:15 +02:00
commit 6b9be608ce
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/asfdec_o.c
View File

@ -776,6 +776,8 @@ static int asf_read_stream_properties(AVFormatContext *s, const GUIDParseTable *
asf_st->span = span;
asf_st->virtual_pkt_len = avio_rl16(pb);
asf_st->virtual_chunk_len = avio_rl16(pb);
if (!asf_st->virtual_chunk_len || !asf_st->virtual_pkt_len)
return AVERROR_INVALIDDATA;
avio_skip(pb, err_data_len - 5);
} else
avio_skip(pb, err_data_len - 1);