mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '2a187a074a7f5ad9f01f72ac9715ddfcb2dbb8ec'
* 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:
commit
6b9be608ce
|
@ -776,6 +776,8 @@ static int asf_read_stream_properties(AVFormatContext *s, const GUIDParseTable *
|
||||||
asf_st->span = span;
|
asf_st->span = span;
|
||||||
asf_st->virtual_pkt_len = avio_rl16(pb);
|
asf_st->virtual_pkt_len = avio_rl16(pb);
|
||||||
asf_st->virtual_chunk_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);
|
avio_skip(pb, err_data_len - 5);
|
||||||
} else
|
} else
|
||||||
avio_skip(pb, err_data_len - 1);
|
avio_skip(pb, err_data_len - 1);
|
||||||
|
|
Loading…
Reference in New Issue