Commit 071e2231 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/tiff: Some checks on bpp for DNG

dng spec 1.5.0.0
"BitsPerSample
Supported values are from 8 to 32 bits/sample. The depth must be the same for each sample if
SamplesPerPixel is not equal to 1."

Fixes: eg_crash
Found-by: 's avatar黄宁 <tsukimurarin@163.com>
Reviewed-by: 's avatarNick Renieris <velocityra@gmail.com>
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent aeb4e435
......@@ -1858,6 +1858,8 @@ again:
}
if (is_dng) {
int bps;
if (s->white_level == 0)
s->white_level = (1 << s->bpp) - 1; /* Default value as per the spec */
......@@ -1866,6 +1868,12 @@ again:
s->black_level, s->white_level);
return AVERROR_INVALIDDATA;
}
if (s->bpp % s->bppcount)
return AVERROR_INVALIDDATA;
bps = s->bpp / s->bppcount;
if (bps < 8 || bps > 32)
return AVERROR_INVALIDDATA;
}
if (!s->is_tiled && !s->strippos && !s->stripoff) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment