mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-03-17 20:17:55 +02:00
avcodec/tiff: Check stripsize strippos for overflow
Fixes: 861/clusterfuzz-testcase-5688284384591872 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 5d996b56499f00f80b02a41bab3d6b7349e36e9d) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
6a70c38e39
commit
72b968361b
@ -904,6 +904,11 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
|
||||
break;
|
||||
case TIFF_STRIP_OFFS:
|
||||
if (count == 1) {
|
||||
if (value > INT_MAX) {
|
||||
av_log(s->avctx, AV_LOG_ERROR,
|
||||
"strippos %u too large\n", value);
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
s->strippos = 0;
|
||||
s->stripoff = value;
|
||||
} else
|
||||
@ -915,6 +920,11 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
|
||||
break;
|
||||
case TIFF_STRIP_SIZE:
|
||||
if (count == 1) {
|
||||
if (value > INT_MAX) {
|
||||
av_log(s->avctx, AV_LOG_ERROR,
|
||||
"stripsize %u too large\n", value);
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
s->stripsizesoff = 0;
|
||||
s->stripsize = value;
|
||||
s->strips = 1;
|
||||
|
Loading…
x
Reference in New Issue
Block a user