[FFmpeg-cvslog] avcodec/libvpxdec: make sure BlockAdditional side data size >= 8

Marton Balint git at videolan.org
Wed Nov 6 09:28:25 EET 2019


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Sun Oct 27 18:10:33 2019 +0100| [99e000704690b2b954c18ca585cc56dfd99e9c16] | committer: James Zern

avcodec/libvpxdec: make sure BlockAdditional side data size >= 8

Signed-off-by: Marton Balint <cus at passwd.hu>
Signed-off-by: James Zern <jzern at google.com>

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

 libavcodec/libvpxdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c
index 164dbda49b..cc91140886 100644
--- a/libavcodec/libvpxdec.c
+++ b/libavcodec/libvpxdec.c
@@ -191,7 +191,7 @@ static int vpx_decode(AVCodecContext *avctx,
     side_data = av_packet_get_side_data(avpkt,
                                         AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
                                         &side_data_size);
-    if (side_data_size > 1) {
+    if (side_data_size >= 8) {
         const uint64_t additional_id = AV_RB64(side_data);
         side_data += 8;
         side_data_size -= 8;



More information about the ffmpeg-cvslog mailing list