[FFmpeg-cvslog] avformat/wavarc: Check if extradata has been fully read

Michael Niedermayer git at videolan.org
Fri Feb 24 03:27:48 EET 2023


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat Feb 18 23:03:37 2023 +0100| [2df271c78cd4b7d481a2d34abb71a2450b43c7e2] | committer: Michael Niedermayer

avformat/wavarc: Check if extradata has been fully read

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2df271c78cd4b7d481a2d34abb71a2450b43c7e2
---

 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;



More information about the ffmpeg-cvslog mailing list