highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/wavarc: properly handle invalid data

Browse Source
This commit is contained in:
Paul B Mahol
2023-02-07 16:26:14 +01:00
parent 62dfa54688
commit 5dba4b217c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/wavarc.c
View File

@@ -371,7 +371,7 @@ static int wavarc_decode(AVCodecContext *avctx, AVFrame *frame,
} }
if ((ret = init_get_bits8(gb, buf, buf_size)) < 0) if ((ret = init_get_bits8(gb, buf, buf_size)) < 0)
return ret; goto fail;
skip_bits(gb, s->skip); skip_bits(gb, s->skip);
switch (avctx->codec_tag) { switch (avctx->codec_tag) {
@@ -397,12 +397,14 @@ static int wavarc_decode(AVCodecContext *avctx, AVFrame *frame,
fail: fail:
s->bitstream_size = 0; s->bitstream_size = 0;
s->bitstream_index = 0; s->bitstream_index = 0;
return ret; if (ret == AVERROR_EOF)
return 0;
return AVERROR_INVALIDDATA;
} }
frame->nb_samples = s->nb_samples; frame->nb_samples = s->nb_samples;
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
return ret; goto fail;
switch (avctx->sample_fmt) { switch (avctx->sample_fmt) {
case AV_SAMPLE_FMT_U8P: case AV_SAMPLE_FMT_U8P: