# HG changeset patch # User rbultje # Date 1273764816 0 # Node ID f2beca0bbf982fa60dc3ce7a5d0b1dc69317e5d9 # Parent 269ce565c70be242d11deb7c7a1d610775ff8e84 Handle palette underflows, fill remaining space with black (zero) data. Patch by Sebastian Vater . diff -r 269ce565c70b -r f2beca0bbf98 iff.c --- a/iff.c Thu May 13 13:18:25 2010 +0000 +++ b/iff.c Thu May 13 15:33:36 2010 +0000 @@ -123,10 +123,8 @@ } count = 1 << avctx->bits_per_coded_sample; - if (avctx->extradata_size < count * 3) { - av_log(avctx, AV_LOG_ERROR, "palette data underflow\n"); - return AVERROR_INVALIDDATA; - } + // If extradata is smaller than actually needed, fill the remaining with black. + count = FFMIN(avctx->extradata_size / 3, count); for (i=0; i < count; i++) { pal[i] = 0xFF000000 | AV_RB24( avctx->extradata + i*3 ); }