diff options
| author | Paul B Mahol <onemda@gmail.com> | 2012-05-30 07:50:32 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2012-05-30 07:50:32 +0000 |
| commit | 8f61526978697e51d3b9e61ea84daf13c42717af (patch) | |
| tree | 6cda4ceb48d6e9d2b1c0dd617b57a99a8760dc92 /libavcodec/iff.c | |
| parent | d66b0cd5c55c66964df6225ebbc8eb7cd3cc91ad (diff) | |
| download | ffmpeg-8f61526978697e51d3b9e61ea84daf13c42717af.tar.gz | |
iff: check if there is extradata
Fixes #1368.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec/iff.c')
| -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 8946bf9858..90cafbd370 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) { |