Commit 27f80ab0 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/tiff: Update pointer only when the result is used

Fixes: runtime error: signed integer overflow: 538976288 * 32 cannot be represented in type 'int'
Fixes: 2310/clusterfuzz-testcase-minimized-4534784887881728

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpegSigned-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 7e98da9c
...@@ -1306,6 +1306,8 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -1306,6 +1306,8 @@ static int decode_frame(AVCodecContext *avctx,
stride = p->linesize[plane]; stride = p->linesize[plane];
dst = p->data[plane]; dst = p->data[plane];
for (i = 0; i < s->height; i += s->rps) { for (i = 0; i < s->height; i += s->rps) {
if (i)
dst += s->rps * stride;
if (s->stripsizesoff) if (s->stripsizesoff)
ssize = ff_tget(&stripsizes, s->sstype, le); ssize = ff_tget(&stripsizes, s->sstype, le);
else else
...@@ -1326,7 +1328,6 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -1326,7 +1328,6 @@ static int decode_frame(AVCodecContext *avctx,
return ret; return ret;
break; break;
} }
dst += s->rps * stride;
} }
if (s->predictor == 2) { if (s->predictor == 2) {
if (s->photometric == TIFF_PHOTOMETRIC_YCBCR) { if (s->photometric == TIFF_PHOTOMETRIC_YCBCR) {
......
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