From bc531eedbd2d31648602ae4112e2b09711f76fdf Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 18 Feb 2023 23:03:37 +0100 Subject: avformat/wavarc: Check if extradata has been fully read Signed-off-by: Michael Niedermayer (cherry picked from commit 2df271c78cd4b7d481a2d34abb71a2450b43c7e2) Signed-off-by: Michael Niedermayer --- libavformat/wavarc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/wavarc.c b/libavformat/wavarc.c index 208b723716..2b5d1b99eb 100644 --- a/libavformat/wavarc.c +++ b/libavformat/wavarc.c @@ -22,6 +22,7 @@ #include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "avformat.h" +#include "avio_internal.h" #include "demux.h" #include "internal.h" @@ -84,7 +85,9 @@ static int wavarc_read_header(AVFormatContext *s) if (ret < 0) return ret; memcpy(par->extradata, data, sizeof(data)); - avio_read(pb, par->extradata + sizeof(data), fmt_len); + ret = ffio_read_size(pb, par->extradata + sizeof(data), fmt_len); + if (ret < 0) + return ret; par->codec_type = AVMEDIA_TYPE_AUDIO; par->codec_id = AV_CODEC_ID_WAVARC; -- cgit v1.2.1