[FFmpeg-cvslog] yopdec: check that palette fits in the packet

[Michael Niedermayer]

ffmpeg | branch: release/0.6 | Michael Niedermayer <michaelni at gmx.at> | Fri Jun  1 15:51:50 2012 +0200| [e37599001cefd7efb683c8228feedf3d291ef1db] | committer: Michael Niedermayer

yopdec: check that palette fits in the packet

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit b6fdf8dea7aaf3cb9a979dce91f752c2ce3086a3)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/yop.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/yop.c b/libavcodec/yop.c
index 1adbd61..69f2e8e 100644
--- a/libavcodec/yop.c
+++ b/libavcodec/yop.c
@@ -203,6 +203,11 @@ static int yop_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
     if (s->frame.data[0])
         avctx->release_buffer(avctx, &s->frame);
 
+    if (avpkt->size < 4 + 3*s->num_pal_colors) {
+        av_log(avctx, AV_LOG_ERROR, "packet of size %d too small\n", avpkt->size);
+        return AVERROR_INVALIDDATA;
+    }
+
     ret = avctx->get_buffer(avctx, &s->frame);
     if (ret < 0) {
         av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");