aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2018-01-14 00:39:40 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2018-01-15 19:55:22 +0100
commit6887e412434776eb260ad3904f565be491dd5726 (patch)
treeffce940d0eba8f5ad334ffa232d268ceae7885ab
parenta1f38c75893c852cf19dcf3e4553549ba1e70950 (diff)
downloadffmpeg-6887e412434776eb260ad3904f565be491dd5726.tar.gz
avcodec/jpeg2000: Check sum of sizes of band->prec before allocating
Fixes: OOM Fixes: 4810/clusterfuzz-testcase-minimized-6034253235093504 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/jpeg2000.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c
index e7f03bd0df..8e90980976 100644
--- a/libavcodec/jpeg2000.c
+++ b/libavcodec/jpeg2000.c
@@ -541,6 +541,9 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp,
if (!reslevel->band)
return AVERROR(ENOMEM);
+ if (reslevel->num_precincts_x * (uint64_t)reslevel->num_precincts_y * reslevel->nbands > avctx->max_pixels / sizeof(*reslevel->band->prec))
+ return AVERROR(ENOMEM);
+
for (bandno = 0; bandno < reslevel->nbands; bandno++, gbandno++) {
ret = init_band(avctx, reslevel,
comp, codsty, qntsty,