Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-08-17 22:22:29 +0300
committerMichael Niedermayer <michael@niedermayer.cc>2016-08-25 04:34:55 +0300
commit79f52a0dbd484aad111e4bf4a4f7047c7ceb6137 (patch)
tree44641c1db8decafc5edb7612926cdb7aef63f758
parentae893819620b49f1a04902dca35852139aaa8d36 (diff)
avcodec/exr: Check tile positions
This also disabled the case of mixed x/ymin with tiles, the code handles these cases inconsistent for the 2 coordinate axis and is unlikely working correctly. Fixes crash Fixes: poc1.exr, poc2.exr Found-by: Yaoguang Chen of Aliapy unLimit Security Team Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 01aee8148d4fa439cce678a11f5110656c98de1f) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/exr.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index cabe329c7f..de46028d18 100644
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -1027,8 +1027,9 @@ static int decode_block(AVCodecContext *avctx, void *tdata,
uint64_t line_offset, uncompressed_size;
uint16_t *ptr_x;
uint8_t *ptr;
- uint32_t data_size, line, col = 0;
- uint32_t tileX, tileY, tileLevelX, tileLevelY;
+ uint32_t data_size;
+ uint64_t line, col = 0;
+ uint64_t tileX, tileY, tileLevelX, tileLevelY;
const uint8_t *src;
int axmax = (avctx->width - (s->xmax + 1)) * 2 * s->desc->nb_components; /* nb pixel to add at the right of the datawindow */
int bxmin = s->xmin * 2 * s->desc->nb_components; /* nb pixel to add at the left of the datawindow */
@@ -1059,9 +1060,18 @@ static int decode_block(AVCodecContext *avctx, void *tdata,
return AVERROR_PATCHWELCOME;
}
+ if (s->xmin || s->ymin) {
+ avpriv_report_missing_feature(s->avctx, "Tiles with xmin/ymin");
+ return AVERROR_PATCHWELCOME;
+ }
+
line = s->tile_attr.ySize * tileY;
col = s->tile_attr.xSize * tileX;
+ if (line < s->ymin || line > s->ymax ||
+ col < s->xmin || col > s->xmax)
+ return AVERROR_INVALIDDATA;
+
td->ysize = FFMIN(s->tile_attr.ySize, s->ydelta - tileY * s->tile_attr.ySize);
td->xsize = FFMIN(s->tile_attr.xSize, s->xdelta - tileX * s->tile_attr.xSize);