[libav-stable] wavpack: check packet size early

Luca Barbato git at libav.org
Wed May 22 22:02:36 CEST 2013


Module: libav
Branch: master
Commit: fd06291239c1bb616bf303b5696cc432710b2530

Author:    Luca Barbato <lu_zero at gentoo.org>
Committer: Luca Barbato <lu_zero at gentoo.org>
Date:      Wed May 22 12:51:42 2013 +0200

wavpack: check packet size early

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable at libav.org

---

 libavcodec/wavpack.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index cfcd22d..e6e9872 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -1203,6 +1203,9 @@ static int wavpack_decode_frame(AVCodecContext *avctx, void *data,
     int frame_size, ret, frame_flags;
     int samplecount = 0;
 
+    if (avpkt->size < 12 + s->multichannel * 4)
+        return AVERROR_INVALIDDATA;
+
     s->block     = 0;
     s->ch_offset = 0;
 



More information about the libav-stable mailing list