eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 18:40:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/exr: Cleanup befor return

Browse Source 
Fixes: leaks
Fixes: 45982/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_fuzzer-6703454090559488

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 885ff3b879)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2023-04-16 15:18:45 +02:00
parent f73735747c
commit 6d0161f742
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/exr.c
View File

@@ -1939,8 +1939,10 @@ static int decode_header(EXRContext *s, AVFrame *frame)
bytestream2_get_buffer(gb, key, FFMIN(sizeof(key) - 1, var_size)); bytestream2_get_buffer(gb, key, FFMIN(sizeof(key) - 1, var_size));
if (strncmp("scanlineimage", key, var_size) && if (strncmp("scanlineimage", key, var_size) &&
strncmp("tiledimage", key, var_size)) strncmp("tiledimage", key, var_size)) {
return AVERROR_PATCHWELCOME; ret = AVERROR_PATCHWELCOME;
goto fail;
}
continue; continue;
} else if ((var_size = check_header_variable(s, "preview", } else if ((var_size = check_header_variable(s, "preview",
@@ -1948,12 +1950,16 @@ static int decode_header(EXRContext *s, AVFrame *frame)
uint32_t pw = bytestream2_get_le32(gb); uint32_t pw = bytestream2_get_le32(gb);
uint32_t ph = bytestream2_get_le32(gb); uint32_t ph = bytestream2_get_le32(gb);
uint64_t psize = pw * ph; uint64_t psize = pw * ph;
if (psize > INT64_MAX / 4) if (psize > INT64_MAX / 4) {
return AVERROR_INVALIDDATA; ret = AVERROR_INVALIDDATA;
goto fail;
}
psize *= 4; psize *= 4;
if ((int64_t)psize >= bytestream2_get_bytes_left(gb)) if ((int64_t)psize >= bytestream2_get_bytes_left(gb)) {
return AVERROR_INVALIDDATA; ret = AVERROR_INVALIDDATA;
goto fail;
}
bytestream2_skip(gb, psize); bytestream2_skip(gb, psize);