Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sycc422_to_rgb(): fix out-of-bounds read accesses when 2 * width_component_1_or_2 + 1 == with_component_0 #1566

Merged
merged 1 commit into from
Nov 26, 2024
Merged

sycc422_to_rgb(): fix out-of-bounds read accesses when 2 * width_component_1_or_2 + 1 == with_component_0 #1566

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 32 additions & 10 deletions src/bin/common/color.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ static void sycc422_to_rgb(opj_image_t *img)
{
int *d0, *d1, *d2, *r, *g, *b;
const int *y, *cb, *cr;
size_t maxw, maxh, max, offx, loopmaxw;
size_t maxw, maxh, max, offx, loopmaxw, comp12w;
int offset, upb;
size_t i;

Expand All @@ -167,6 +167,7 @@ static void sycc422_to_rgb(opj_image_t *img)
upb = (1 << upb) - 1;

maxw = (size_t)img->comps[0].w;
comp12w = (size_t)img->comps[1].w;
maxh = (size_t)img->comps[0].h;
max = maxw * maxh;

Expand Down Expand Up @@ -212,13 +213,19 @@ static void sycc422_to_rgb(opj_image_t *img)
++cr;
}
if (j < loopmaxw) {
sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
if (j / 2 == comp12w) {
sycc_to_rgb(offset, upb, *y, 0, 0, r, g, b);
} else {
sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
}
++y;
++r;
++g;
++b;
++cb;
++cr;
if (j / 2 < comp12w) {
++cb;
++cr;
}
}
}

Expand Down Expand Up @@ -246,7 +253,7 @@ static void sycc420_to_rgb(opj_image_t *img)
{
int *d0, *d1, *d2, *r, *g, *b, *nr, *ng, *nb;
const int *y, *cb, *cr, *ny;
size_t maxw, maxh, max, offx, loopmaxw, offy, loopmaxh;
size_t maxw, maxh, max, offx, loopmaxw, offy, loopmaxh, comp12w;
int offset, upb;
size_t i;

Expand All @@ -255,6 +262,7 @@ static void sycc420_to_rgb(opj_image_t *img)
upb = (1 << upb) - 1;

maxw = (size_t)img->comps[0].w;
comp12w = (size_t)img->comps[1].w;
maxh = (size_t)img->comps[0].h;
max = maxw * maxh;

Expand Down Expand Up @@ -336,19 +344,29 @@ static void sycc420_to_rgb(opj_image_t *img)
++cr;
}
if (j < loopmaxw) {
sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
if (j / 2 == comp12w) {
sycc_to_rgb(offset, upb, *y, 0, 0, r, g, b);
} else {
sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
}
++y;
++r;
++g;
++b;

sycc_to_rgb(offset, upb, *ny, *cb, *cr, nr, ng, nb);
if (j / 2 == comp12w) {
sycc_to_rgb(offset, upb, *ny, 0, 0, nr, ng, nb);
} else {
sycc_to_rgb(offset, upb, *ny, *cb, *cr, nr, ng, nb);
}
++ny;
++nr;
++ng;
++nb;
++cb;
++cr;
if (j / 2 < comp12w) {
++cb;
++cr;
}
}
y += maxw;
r += maxw;
Expand Down Expand Up @@ -384,7 +402,11 @@ static void sycc420_to_rgb(opj_image_t *img)
++cr;
}
if (j < loopmaxw) {
sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
if (j / 2 == comp12w) {
sycc_to_rgb(offset, upb, *y, 0, 0, r, g, b);
} else {
sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
}
}
}

Expand Down