virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/tiff: Fix loop detection

Browse Source 
Fixes regression with tickets/4364/L1004220.DNG

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2022-09-12 19:55:09 +02:00
parent fb233771ce
commit 43a4854510
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/tiff.c
View File

@@ -1747,7 +1747,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *p,
int *got_frame, AVPacket *avpkt) int *got_frame, AVPacket *avpkt)
{ {
TiffContext *const s = avctx->priv_data; TiffContext *const s = avctx->priv_data;
unsigned off, last_off; unsigned off, last_off = 0;
int le, ret, plane, planes; int le, ret, plane, planes;
int i, j, entries, stride; int i, j, entries, stride;
unsigned soff, ssize; unsigned soff, ssize;
@@ -1812,7 +1812,6 @@ again:
/** whether we should process this multi-page IFD's next page */ /** whether we should process this multi-page IFD's next page */
retry_for_page = s->get_page && s->cur_page + 1 < s->get_page; // get_page is 1-indexed retry_for_page = s->get_page && s->cur_page + 1 < s->get_page; // get_page is 1-indexed
last_off = off;
if (retry_for_page) { if (retry_for_page) {
// set offset to the next IFD // set offset to the next IFD
off = ff_tget_long(&s->gb, le); off = ff_tget_long(&s->gb, le);
@@ -1830,6 +1829,7 @@ again:
avpriv_request_sample(s->avctx, "non increasing IFD offset"); avpriv_request_sample(s->avctx, "non increasing IFD offset");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
last_off = off;
if (off >= UINT_MAX - 14 || avpkt->size < off + 14) { if (off >= UINT_MAX - 14 || avpkt->size < off + 14) {
av_log(avctx, AV_LOG_ERROR, "IFD offset is greater than image size\n"); av_log(avctx, AV_LOG_ERROR, "IFD offset is greater than image size\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;