highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/exr: More strictly check dc_count

Browse Source 
Fixes: out of array access
Fixes: exr/deneme

Found-by: Burak Çarıkçı <burakcarikci@crypttech.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2021-05-25 19:29:18 +02:00
parent 48342aa075
commit 26d3c81bc5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/exr.c
View File

@ -1059,11 +1059,11 @@ static int dwa_uncompress(EXRContext *s, const uint8_t *src, int compressed_size
bytestream2_skip(&gb, ac_size); bytestream2_skip(&gb, ac_size);
} }
if (dc_size > 0) { {
unsigned long dest_len = dc_count * 2LL; unsigned long dest_len = dc_count * 2LL;
GetByteContext agb = gb; GetByteContext agb = gb;
if (dc_count > (6LL * td->xsize * td->ysize + 63) / 64) if (dc_count != dc_w * dc_h * 3)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
av_fast_padded_malloc(&td->dc_data, &td->dc_size, FFALIGN(dest_len, 64) * 2); av_fast_padded_malloc(&td->dc_data, &td->dc_size, FFALIGN(dest_len, 64) * 2);