[FFmpeg-cvslog] wavpack: validate samples size parsed in wavpack_decode_block

[Luca Barbato]

ffmpeg | branch: release/1.1 | Luca Barbato <lu_zero at gentoo.org> | Fri May 17 18:29:15 2013 +0200| [c340319559bfcd9664a3ea29e73ac80b3fbc2d4d] | committer: Reinhard Tartler

wavpack: validate samples size parsed in wavpack_decode_block

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable at libav.org
(cherry picked from commit ed50673066956d6f2201a57c3254569f2ab08d9d)

Signed-off-by: Reinhard Tartler <siretart at tauware.de>

Conflicts:
	libavcodec/wavpack.c

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

 libavcodec/wavpack.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index e8f34fa..96ea610 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -796,6 +796,9 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
 
     if (!wc->mkv_mode) {
         s->samples = AV_RL32(buf); buf += 4;
+        if (s->samples != wc->samples)
+            return AVERROR_INVALIDDATA;
+
         if (!s->samples) {
             *got_frame_ptr = 0;
             return 0;