[FFmpeg-cvslog] dsicinav: Clip the source size to the expected maximum

[Luca Barbato]

ffmpeg | branch: release/0.10 | Luca Barbato <lu_zero at gentoo.org> | Fri Jul 19 21:34:21 2013 +0200| [b8ba48c725dcda56d5dccc1474322857a7e3ed13] | committer: Luca Barbato

dsicinav: Clip the source size to the expected maximum

A packet larger than cin->bitmap_size does not make sense.

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

Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

Conflicts:
	libavcodec/dsicinav.c

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

 libavcodec/dsicinav.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/dsicinav.c b/libavcodec/dsicinav.c
index 108424c..03bdeaf 100644
--- a/libavcodec/dsicinav.c
+++ b/libavcodec/dsicinav.c
@@ -234,6 +234,8 @@ static int cinvideo_decode_frame(AVCodecContext *avctx,
         }
     }
 
+    bitmap_frame_size = FFMIN(cin->bitmap_size, bitmap_frame_size);
+
     /* note: the decoding routines below assumes that surface.width = surface.pitch */
     switch (bitmap_frame_type) {
     case 9: