har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavc/binkaudio: reset input packet on errors

Browse Source 
Make sure we don't repeatedly try to decode the same packet, making no
progress and possibly causing an infinite loop.
This commit is contained in:
Anton Khirnov 2023-06-17 04:51:25 +02:00
parent f2349e7e62
commit 593e8c2c6a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/binkaudio.c
View File

@ -325,7 +325,7 @@ again:
if (s->ch_offset == 0) {
frame->nb_samples = s->frame_len;
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
return ret;
goto fail;
if (!new_pkt)
frame->pts = AV_NOPTS_VALUE;
}
@ -334,8 +334,8 @@ again:
avctx->codec->id == AV_CODEC_ID_BINKAUDIO_DCT,
FFMIN(MAX_CHANNELS, s->channels - s->ch_offset), s->ch_offset)) {
av_log(avctx, AV_LOG_ERROR, "Incomplete packet\n");
s->ch_offset = 0;
return AVERROR_INVALIDDATA;
ret = AVERROR_INVALIDDATA;
goto fail;
}
s->ch_offset += MAX_CHANNELS;
get_bits_align32(gb);