From ad593c9e0622e0d8d87228e67e4dbd36243ffd22 Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Fri, 29 Apr 2016 23:51:14 +0200 Subject: [PATCH] Fix heap-buffer-overflow in color_esycc_to_rgb (#748) When all components do not have the same dx/dy, components buffer are read beyond their end. Do not convert in this case. Update uclouvain/openjpeg#725 --- src/bin/common/color.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/bin/common/color.c b/src/bin/common/color.c index cd4fafdd..00eac515 100644 --- a/src/bin/common/color.c +++ b/src/bin/common/color.c @@ -890,7 +890,14 @@ void color_esycc_to_rgb(opj_image_t *image) int flip_value = (1 << (image->comps[0].prec-1)); int max_value = (1 << image->comps[0].prec) - 1; - if(image->numcomps < 3) return; + if ( + (image->numcomps < 3) + || (image->comps[0].dx != image->comps[1].dx) || (image->comps[0].dx != image->comps[2].dx) + || (image->comps[0].dy != image->comps[1].dy) || (image->comps[0].dy != image->comps[2].dy) + ) { + fprintf(stderr,"%s:%d:color_esycc_to_rgb\n\tCAN NOT CONVERT\n", __FILE__,__LINE__); + return; + } w = image->comps[0].w; h = image->comps[0].h;