Skip to content
Permalink
Browse files Browse the repository at this point in the history
avcodec/exr: More strictly check dc_count
Fixes: out of array access
Fixes: exr/deneme

Found-by: Burak Çarıkçı <burakcarikci@crypttech.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
  • Loading branch information
michaelni committed May 27, 2021
1 parent 48342aa commit 26d3c81
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions libavcodec/exr.c
Expand Up @@ -1059,11 +1059,11 @@ static int dwa_uncompress(EXRContext *s, const uint8_t *src, int compressed_size
bytestream2_skip(&gb, ac_size);
}

if (dc_size > 0) {
{
unsigned long dest_len = dc_count * 2LL;
GetByteContext agb = gb;

if (dc_count > (6LL * td->xsize * td->ysize + 63) / 64)
if (dc_count != dc_w * dc_h * 3)
return AVERROR_INVALIDDATA;

av_fast_padded_malloc(&td->dc_data, &td->dc_size, FFALIGN(dest_len, 64) * 2);
Expand Down

0 comments on commit 26d3c81

Please sign in to comment.