virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-11 14:30:22 +02:00
Code Issues Releases Activity

avcodec/tiff: Check value on positive signed targets

Browse Source 
Fixes: CID1604593 Overflowed constant

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 66d6b8033b)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2024-07-07 20:47:24 +02:00
parent 333a623915
commit 3e0da83058
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/tiff.c
View File

@ -1297,9 +1297,13 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
s->is_thumbnail = (value != 0); s->is_thumbnail = (value != 0);
break; break;
case TIFF_WIDTH: case TIFF_WIDTH:
if (value > INT_MAX)
return AVERROR_INVALIDDATA;
s->width = value; s->width = value;
break; break;
case TIFF_HEIGHT: case TIFF_HEIGHT:
if (value > INT_MAX)
return AVERROR_INVALIDDATA;
s->height = value; s->height = value;
break; break;
case TIFF_BPP: case TIFF_BPP:
@ -1431,12 +1435,18 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
s->tile_byte_counts_offset = off; s->tile_byte_counts_offset = off;
break; break;
case TIFF_TILE_LENGTH: case TIFF_TILE_LENGTH:
if (value > INT_MAX)
return AVERROR_INVALIDDATA;
s->tile_length = value; s->tile_length = value;
break; break;
case TIFF_TILE_WIDTH: case TIFF_TILE_WIDTH:
if (value > INT_MAX)
return AVERROR_INVALIDDATA;
s->tile_width = value; s->tile_width = value;
break; break;
case TIFF_PREDICTOR: case TIFF_PREDICTOR:
if (value > INT_MAX)
return AVERROR_INVALIDDATA;
s->predictor = value; s->predictor = value;
break; break;
case TIFF_SUB_IFDS: case TIFF_SUB_IFDS:
@ -1581,12 +1591,18 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
} }
break; break;
case TIFF_T4OPTIONS: case TIFF_T4OPTIONS:
if (s->compr == TIFF_G3) if (s->compr == TIFF_G3) {
if (value > INT_MAX)
return AVERROR_INVALIDDATA;
s->fax_opts = value; s->fax_opts = value;
}
break; break;
case TIFF_T6OPTIONS: case TIFF_T6OPTIONS:
if (s->compr == TIFF_G4) if (s->compr == TIFF_G4) {
if (value > INT_MAX)
return AVERROR_INVALIDDATA;
s->fax_opts = value; s->fax_opts = value;
}
break; break;
#define ADD_METADATA(count, name, sep)\ #define ADD_METADATA(count, name, sep)\
if ((ret = add_metadata(count, type, name, sep, s, frame)) < 0) {\ if ((ret = add_metadata(count, type, name, sep, s, frame)) < 0) {\