diff options
| author | Paul B Mahol <onemda@gmail.com> | 2012-05-30 07:50:32 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-09 20:41:15 +0200 |
| commit | fc0d962919e2be08245135a6f2c2b53ff09c7bf0 (patch) | |
| tree | ab84c7340d6841f9f72bf495d0ae6724b4e25b46 | |
| parent | 0452ebfd4b97a60baf1211e8ac217ad501f7a149 (diff) | |
| download | ffmpeg-fc0d962919e2be08245135a6f2c2b53ff09c7bf0.tar.gz | |
iff: check if there is extradata
Fixes #1368.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit 8f61526978697e51d3b9e61ea84daf13c42717af)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/iff.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/iff.c b/libavcodec/iff.c index 8a9141af5a..eca795aa66 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) { |