[FFmpeg-cvslog] iff: check if there is extradata

[Paul B Mahol]

ffmpeg | branch: release/0.10 | Paul B Mahol <onemda at gmail.com> | Wed May 30 07:50:32 2012 +0000| [fc0d962919e2be08245135a6f2c2b53ff09c7bf0] | committer: Michael Niedermayer

iff: check if there is extradata

Fixes #1368.

Signed-off-by: Paul B Mahol <onemda at gmail.com>
(cherry picked from commit 8f61526978697e51d3b9e61ea84daf13c42717af)

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

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

 libavcodec/iff.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libavcodec/iff.c b/libavcodec/iff.c
index 8a9141a..eca795a 100644
--- a/libavcodec/iff.c
+++ b/libavcodec/iff.c
@@ -316,7 +316,12 @@ static av_cold int decode_init(AVCodecContext *avctx)
     int err;
 
     if (avctx->bits_per_coded_sample <= 8) {
-        int palette_size = avctx->extradata_size - AV_RB16(avctx->extradata);
+        int palette_size;
+
+        if (avctx->extradata_size >= 2)
+            palette_size = avctx->extradata_size - AV_RB16(avctx->extradata);
+        else
+            palette_size = 0;
         avctx->pix_fmt = (avctx->bits_per_coded_sample < 8) ||
                          (avctx->extradata_size >= 2 && palette_size) ? PIX_FMT_PAL8 : PIX_FMT_GRAY8;
     } else if (avctx->bits_per_coded_sample <= 32) {