walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix Out-Of-Bounds Read in sycc42x_to_rgb function (#745) 

42x Images with an odd x0/y0 lead to subsampled component starting at the
2nd column/line.
That is offset = comp->dx * comp->x0 - image->x0 = 1

Fix #726
This commit is contained in:
Matthieu Darbois 2016-04-30 00:33:27 +02:00
parent ad593c9e06
commit 15f081c896
2 changed files with 87 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
src/bin/common/color.c
View File

@ -91,22 +91,22 @@ static void sycc444_to_rgb(opj_image_t *img)
{ {
int *d0, *d1, *d2, *r, *g, *b; int *d0, *d1, *d2, *r, *g, *b;
const int *y, *cb, *cr; const int *y, *cb, *cr;
unsigned int maxw, maxh, max, i; size_t maxw, maxh, max, i;
int offset, upb; int offset, upb;
upb = (int)img->comps[0].prec; upb = (int)img->comps[0].prec;
offset = 1<<(upb - 1); upb = (1<<upb)-1; offset = 1<<(upb - 1); upb = (1<<upb)-1;
maxw = (unsigned int)img->comps[0].w; maxh = (unsigned int)img->comps[0].h; maxw = (size_t)img->comps[0].w; maxh = (size_t)img->comps[0].h;
max = maxw * maxh; max = maxw * maxh;
y = img->comps[0].data; y = img->comps[0].data;
cb = img->comps[1].data; cb = img->comps[1].data;
cr = img->comps[2].data; cr = img->comps[2].data;
d0 = r = (int*)malloc(sizeof(int) * (size_t)max); d0 = r = (int*)malloc(sizeof(int) * max);
d1 = g = (int*)malloc(sizeof(int) * (size_t)max); d1 = g = (int*)malloc(sizeof(int) * max);
d2 = b = (int*)malloc(sizeof(int) * (size_t)max); d2 = b = (int*)malloc(sizeof(int) * max);
if(r == NULL || g == NULL || b == NULL) goto fails; if(r == NULL || g == NULL || b == NULL) goto fails;
@ -118,107 +118,138 @@ static void sycc444_to_rgb(opj_image_t *img)
free(img->comps[0].data); img->comps[0].data = d0; free(img->comps[0].data); img->comps[0].data = d0;
free(img->comps[1].data); img->comps[1].data = d1; free(img->comps[1].data); img->comps[1].data = d1;
free(img->comps[2].data); img->comps[2].data = d2; free(img->comps[2].data); img->comps[2].data = d2;
img->color_space = OPJ_CLRSPC_SRGB;
return; return;
fails: fails:
if(r) free(r); free(r);
if(g) free(g); free(g);
if(b) free(b); free(b);
}/* sycc444_to_rgb() */ }/* sycc444_to_rgb() */
static void sycc422_to_rgb(opj_image_t *img) static void sycc422_to_rgb(opj_image_t *img)
{ {
int *d0, *d1, *d2, *r, *g, *b; int *d0, *d1, *d2, *r, *g, *b;
const int *y, *cb, *cr; const int *y, *cb, *cr;
unsigned int maxw, maxh, max; size_t maxw, maxh, max, offx, loopmaxw;
int offset, upb; int offset, upb;
unsigned int i, j; size_t i;
upb = (int)img->comps[0].prec; upb = (int)img->comps[0].prec;
offset = 1<<(upb - 1); upb = (1<<upb)-1; offset = 1<<(upb - 1); upb = (1<<upb)-1;
maxw = (unsigned int)img->comps[0].w; maxh = (unsigned int)img->comps[0].h; maxw = (size_t)img->comps[0].w; maxh = (size_t)img->comps[0].h;
max = maxw * maxh; max = maxw * maxh;
y = img->comps[0].data; y = img->comps[0].data;
cb = img->comps[1].data; cb = img->comps[1].data;
cr = img->comps[2].data; cr = img->comps[2].data;
d0 = r = (int*)malloc(sizeof(int) * (size_t)max); d0 = r = (int*)malloc(sizeof(int) * max);
d1 = g = (int*)malloc(sizeof(int) * (size_t)max); d1 = g = (int*)malloc(sizeof(int) * max);
d2 = b = (int*)malloc(sizeof(int) * (size_t)max); d2 = b = (int*)malloc(sizeof(int) * max);
if(r == NULL || g == NULL || b == NULL) goto fails; if(r == NULL || g == NULL || b == NULL) goto fails;
/* if img->x0 is odd, then first column shall use Cb/Cr = 0 */
offx = img->x0 & 1U;
loopmaxw = maxw - offx;
for(i=0U; i < maxh; ++i) for(i=0U; i < maxh; ++i)
{ {
for(j=0U; j < (maxw & ~(unsigned int)1U); j += 2U) size_t j;
if (offx > 0U) {
sycc_to_rgb(offset, upb, *y, 0, 0, r, g, b);
++y; ++r; ++g; ++b;
}
for(j=0U; j < (loopmaxw & ~(size_t)1U); j += 2U)
{ {
sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b); sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
++y; ++r; ++g; ++b; ++y; ++r; ++g; ++b;
sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b); sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
++y; ++r; ++g; ++b; ++cb; ++cr; ++y; ++r; ++g; ++b; ++cb; ++cr;
} }
if (j < maxw) { if (j < loopmaxw) {
sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b); sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
++y; ++r; ++g; ++b; ++cb; ++cr; ++y; ++r; ++g; ++b; ++cb; ++cr;
} }
} }
free(img->comps[0].data); img->comps[0].data = d0; free(img->comps[0].data); img->comps[0].data = d0;
free(img->comps[1].data); img->comps[1].data = d1; free(img->comps[1].data); img->comps[1].data = d1;
free(img->comps[2].data); img->comps[2].data = d2; free(img->comps[2].data); img->comps[2].data = d2;
#if defined(USE_JPWL) || defined(USE_MJ2) img->comps[1].w = img->comps[2].w = img->comps[0].w;
img->comps[1].w = maxw; img->comps[1].h = maxh; img->comps[1].h = img->comps[2].h = img->comps[0].h;
img->comps[2].w = maxw; img->comps[2].h = maxh; img->comps[1].dx = img->comps[2].dx = img->comps[0].dx;
#else img->comps[1].dy = img->comps[2].dy = img->comps[0].dy;
img->comps[1].w = (OPJ_UINT32)maxw; img->comps[1].h = (OPJ_UINT32)maxh; img->color_space = OPJ_CLRSPC_SRGB;
img->comps[2].w = (OPJ_UINT32)maxw; img->comps[2].h = (OPJ_UINT32)maxh;
#endif
img->comps[1].dx = img->comps[0].dx;
img->comps[2].dx = img->comps[0].dx;
img->comps[1].dy = img->comps[0].dy;
img->comps[2].dy = img->comps[0].dy;
return; return;
fails: fails:
if(r) free(r); free(r);
if(g) free(g); free(g);
if(b) free(b); free(b);
}/* sycc422_to_rgb() */ }/* sycc422_to_rgb() */
static void sycc420_to_rgb(opj_image_t *img) static void sycc420_to_rgb(opj_image_t *img)
{ {
int *d0, *d1, *d2, *r, *g, *b, *nr, *ng, *nb; int *d0, *d1, *d2, *r, *g, *b, *nr, *ng, *nb;
const int *y, *cb, *cr, *ny; const int *y, *cb, *cr, *ny;
unsigned int maxw, maxh, max; size_t maxw, maxh, max, offx, loopmaxw, offy, loopmaxh;
int offset, upb; int offset, upb;
unsigned int i, j; size_t i;
upb = (int)img->comps[0].prec; upb = (int)img->comps[0].prec;
offset = 1<<(upb - 1); upb = (1<<upb)-1; offset = 1<<(upb - 1); upb = (1<<upb)-1;
maxw = (unsigned int)img->comps[0].w; maxh = (unsigned int)img->comps[0].h; maxw = (size_t)img->comps[0].w; maxh = (size_t)img->comps[0].h;
max = maxw * maxh; max = maxw * maxh;
y = img->comps[0].data; y = img->comps[0].data;
cb = img->comps[1].data; cb = img->comps[1].data;
cr = img->comps[2].data; cr = img->comps[2].data;
d0 = r = (int*)malloc(sizeof(int) * (size_t)max); d0 = r = (int*)malloc(sizeof(int) * max);
d1 = g = (int*)malloc(sizeof(int) * (size_t)max); d1 = g = (int*)malloc(sizeof(int) * max);
d2 = b = (int*)malloc(sizeof(int) * (size_t)max); d2 = b = (int*)malloc(sizeof(int) * max);
if(r == NULL || g == NULL || b == NULL) goto fails; if (r == NULL || g == NULL || b == NULL) goto fails;
for(i=0U; i < (maxh & ~(unsigned int)1U); i += 2U) /* if img->x0 is odd, then first column shall use Cb/Cr = 0 */
offx = img->x0 & 1U;
loopmaxw = maxw - offx;
/* if img->y0 is odd, then first line shall use Cb/Cr = 0 */
offy = img->y0 & 1U;
loopmaxh = maxh - offy;
if (offy > 0U) {
size_t j;
for(j=0; j < maxw; ++j)
{ {
sycc_to_rgb(offset, upb, *y, 0, 0, r, g, b);
++y; ++r; ++g; ++b;
}
}
for(i=0U; i < (loopmaxh & ~(size_t)1U); i += 2U)
{
size_t j;
ny = y + maxw; ny = y + maxw;
nr = r + maxw; ng = g + maxw; nb = b + maxw; nr = r + maxw; ng = g + maxw; nb = b + maxw;
for(j=0; j < (maxw & ~(unsigned int)1U); j += 2U) if (offx > 0U) {
sycc_to_rgb(offset, upb, *y, 0, 0, r, g, b);
++y; ++r; ++g; ++b;
sycc_to_rgb(offset, upb, *ny, *cb, *cr, nr, ng, nb);
++ny; ++nr; ++ng; ++nb;
}
for(j=0; j < (loopmaxw & ~(size_t)1U); j += 2U)
{ {
sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b); sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
++y; ++r; ++g; ++b; ++y; ++r; ++g; ++b;
@ -230,7 +261,7 @@ static void sycc420_to_rgb(opj_image_t *img)
sycc_to_rgb(offset, upb, *ny, *cb, *cr, nr, ng, nb); sycc_to_rgb(offset, upb, *ny, *cb, *cr, nr, ng, nb);
++ny; ++nr; ++ng; ++nb; ++cb; ++cr; ++ny; ++nr; ++ng; ++nb; ++cb; ++cr;
} }
if(j < maxw) if(j < loopmaxw)
{ {
sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b); sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
++y; ++r; ++g; ++b; ++y; ++r; ++g; ++b;
@ -240,9 +271,11 @@ static void sycc420_to_rgb(opj_image_t *img)
} }
y += maxw; r += maxw; g += maxw; b += maxw; y += maxw; r += maxw; g += maxw; b += maxw;
} }
if(i < maxh) if(i < loopmaxh)
{ {
for(j=0U; j < (maxw & ~(unsigned int)1U); j += 2U) size_t j;
for(j=0U; j < (maxw & ~(size_t)1U); j += 2U)
{ {
sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b); sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
@ -262,24 +295,17 @@ static void sycc420_to_rgb(opj_image_t *img)
free(img->comps[1].data); img->comps[1].data = d1; free(img->comps[1].data); img->comps[1].data = d1;
free(img->comps[2].data); img->comps[2].data = d2; free(img->comps[2].data); img->comps[2].data = d2;
#if defined(USE_JPWL) || defined(USE_MJ2) img->comps[1].w = img->comps[2].w = img->comps[0].w;
img->comps[1].w = maxw; img->comps[1].h = maxh; img->comps[1].h = img->comps[2].h = img->comps[0].h;
img->comps[2].w = maxw; img->comps[2].h = maxh; img->comps[1].dx = img->comps[2].dx = img->comps[0].dx;
#else img->comps[1].dy = img->comps[2].dy = img->comps[0].dy;
img->comps[1].w = (OPJ_UINT32)maxw; img->comps[1].h = (OPJ_UINT32)maxh; img->color_space = OPJ_CLRSPC_SRGB;
img->comps[2].w = (OPJ_UINT32)maxw; img->comps[2].h = (OPJ_UINT32)maxh;
#endif
img->comps[1].dx = img->comps[0].dx;
img->comps[2].dx = img->comps[0].dx;
img->comps[1].dy = img->comps[0].dy;
img->comps[2].dy = img->comps[0].dy;
return; return;
fails: fails:
if(r) free(r); free(r);
if(g) free(g); free(g);
if(b) free(b); free(b);
}/* sycc420_to_rgb() */ }/* sycc420_to_rgb() */
void color_sycc_to_rgb(opj_image_t *img) void color_sycc_to_rgb(opj_image_t *img)
@ -324,8 +350,6 @@ void color_sycc_to_rgb(opj_image_t *img)
fprintf(stderr,"%s:%d:color_sycc_to_rgb\n\tCAN NOT CONVERT\n", __FILE__,__LINE__); fprintf(stderr,"%s:%d:color_sycc_to_rgb\n\tCAN NOT CONVERT\n", __FILE__,__LINE__);
return; return;
} }
img->color_space = OPJ_CLRSPC_SRGB;
}/* color_sycc_to_rgb() */ }/* color_sycc_to_rgb() */
#if defined(OPJ_HAVE_LIBLCMS2) || defined(OPJ_HAVE_LIBLCMS1) #if defined(OPJ_HAVE_LIBLCMS2) || defined(OPJ_HAVE_LIBLCMS1)

2
src/bin/jp2/convertbmp.c
View File

@ -967,7 +967,7 @@ int imagetobmp(opj_image_t * image, const char *outfile) {
fprintf(fdest, "%c", (OPJ_UINT8)r); fprintf(fdest, "%c", (OPJ_UINT8)r);
if ((i + 1) % w == 0) { if ((i + 1) % w == 0) {
for ((pad = w % 4) ? (4 - w % 4) : 0; pad > 0; pad--) /* ADD */ for (pad = (w % 4) ? (4 - w % 4) : 0; pad > 0; pad--) /* ADD */
fprintf(fdest, "%c", 0); fprintf(fdest, "%c", 0);
} }
} }