virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avformat/dsfdec: properly handle padded last packet

Browse Source 
Fixes #5489.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2018-04-22 11:52:32 +02:00
parent f97fa89925
commit 5d3efe9e1f
1 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libavformat/dsfdec.c
View File

@ -26,6 +26,8 @@
typedef struct {
uint64_t data_end;
uint64_t audio_size;
uint64_t data_size;
} DSFContext;
static int dsf_probe(AVProbeData *p)
@ -120,7 +122,7 @@ static int dsf_read_header(AVFormatContext *s)
return AVERROR_INVALIDDATA;
}
avio_skip(pb, 8);
dsf->audio_size = avio_rl64(pb) / 8 * st->codecpar->channels;
st->codecpar->block_align = avio_rl32(pb);
if (st->codecpar->block_align > INT_MAX / st->codecpar->channels) {
avpriv_request_sample(s, "block_align overflow");
@ -135,7 +137,9 @@ static int dsf_read_header(AVFormatContext *s)
dsf->data_end = avio_tell(pb);
if (avio_rl32(pb) != MKTAG('d', 'a', 't', 'a'))
return AVERROR_INVALIDDATA;
dsf->data_end += avio_rl64(pb);
dsf->data_size = avio_rl64(pb);
dsf->data_end += dsf->data_size;
s->internal->data_offset = avio_tell(pb);
return 0;
}
@ -151,6 +155,34 @@ static int dsf_read_packet(AVFormatContext *s, AVPacket *pkt)
return AVERROR_EOF;
pkt->stream_index = 0;
if (dsf->data_size > dsf->audio_size) {
int last_packet = pos == (dsf->data_end - st->codecpar->block_align);
if (last_packet) {
int64_t data_pos = pos - s->internal->data_offset;
int64_t packet_size = dsf->audio_size - data_pos;
int64_t skip_size = dsf->data_size - data_pos - packet_size;
uint8_t *dst;
int ch, ret;
if (packet_size <= 0 || skip_size <= 0)
return AVERROR_INVALIDDATA;
if (av_new_packet(pkt, packet_size) < 0)
return AVERROR(ENOMEM);
dst = pkt->data;
for (ch = 0; ch < st->codecpar->channels; ch++) {
ret = avio_read(pb, dst, packet_size / st->codecpar->channels);
if (ret < packet_size / st->codecpar->channels)
return AVERROR_EOF;
dst += ret;
avio_skip(pb, skip_size / st->codecpar->channels);
}
return 0;
}
}
return av_get_packet(pb, pkt, FFMIN(dsf->data_end - pos, st->codecpar->block_align));
}