[FFmpeg-cvslog] avcodec/cinepak: Check side data size before use

[Michael Niedermayer]

ffmpeg | branch: release/2.8 | Michael Niedermayer <michael at niedermayer.cc> | Sun Oct 30 13:47:38 2016 +0100| [41b1ec0810197633bd55aa5ab9cd9885443cb0ad] | committer: Michael Niedermayer

avcodec/cinepak: Check side data size before use

Fixes out of array read

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 121be310607879841d19a34d9f16d4fe9ba7f18c)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavcodec/cinepak.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c
index f1a4656..58c26dc 100644
--- a/libavcodec/cinepak.c
+++ b/libavcodec/cinepak.c
@@ -443,10 +443,13 @@ static int cinepak_decode_frame(AVCodecContext *avctx,
         return ret;
 
     if (s->palette_video) {
-        const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL);
-        if (pal) {
+        int size;
+        const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, &size);
+        if (pal && size == AVPALETTE_SIZE) {
             s->frame->palette_has_changed = 1;
             memcpy(s->pal, pal, AVPALETTE_SIZE);
+        } else if (pal) {
+            av_log(avctx, AV_LOG_ERROR, "Palette size %d is wrong\n", size);
         }
     }