From b239948ad9df35a578e1728395a0434fc7fe5035 Mon Sep 17 00:00:00 2001 From: Mehdi Sabwat Date: Wed, 9 Jun 2021 21:26:06 +0200 Subject: [PATCH] common: fix sycc420_to_rgb buffer overflow --- src/bin/common/color.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/bin/common/color.c b/src/bin/common/color.c index 27f15f13..7c7716d2 100644 --- a/src/bin/common/color.c +++ b/src/bin/common/color.c @@ -367,13 +367,15 @@ static void sycc420_to_rgb(opj_image_t *img) ++b; sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b); - - ++y; + if (*y != img->comps[0].data[max]) + ++y; ++r; ++g; ++b; - ++cb; - ++cr; + if (*cb != img->comps[1].data[max]) + ++cb; + if (*cr != img->comps[2].data[max]) + ++cr; } if (j < maxw) { sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);