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

bmp_read_rle8_data(): avoid potential infinite loop (#996)

This commit is contained in:
Even Rouault 2017-08-18 10:16:38 +02:00
parent 17ea17f487
commit 5597522cac
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -529,10 +529,19 @@ static OPJ_BOOL bmp_read_rle8_data(FILE* IN, OPJ_UINT8* pData,
x = y = 0U; x = y = 0U;
while (y < height) { while (y < height) {
int c = getc(IN); int c = getc(IN);
if (c == EOF) {
return OPJ_FALSE;
}
if (c) { if (c) {
int j; int j, c1_int;
OPJ_UINT8 c1 = (OPJ_UINT8)getc(IN); OPJ_UINT8 c1;
c1_int = getc(IN);
if (c1_int == EOF) {
return OPJ_FALSE;
}
c1 = (OPJ_UINT8)c1_int;
for (j = 0; (j < c) && (x < width) && for (j = 0; (j < c) && (x < width) &&
((OPJ_SIZE_T)pix < (OPJ_SIZE_T)beyond); j++, x++, pix++) { ((OPJ_SIZE_T)pix < (OPJ_SIZE_T)beyond); j++, x++, pix++) {
@ -540,6 +549,10 @@ static OPJ_BOOL bmp_read_rle8_data(FILE* IN, OPJ_UINT8* pData,
} }
} else { } else {
c = getc(IN); c = getc(IN);
if (c == EOF) {
return OPJ_FALSE;
}
if (c == 0x00) { /* EOL */ if (c == 0x00) { /* EOL */
x = 0; x = 0;
++y; ++y;
@ -548,19 +561,34 @@ static OPJ_BOOL bmp_read_rle8_data(FILE* IN, OPJ_UINT8* pData,
break; break;
} else if (c == 0x02) { /* MOVE by dxdy */ } else if (c == 0x02) { /* MOVE by dxdy */
c = getc(IN); c = getc(IN);
if (c == EOF) {
return OPJ_FALSE;
}
x += (OPJ_UINT32)c; x += (OPJ_UINT32)c;
c = getc(IN); c = getc(IN);
if (c == EOF) {
return OPJ_FALSE;
}
y += (OPJ_UINT32)c; y += (OPJ_UINT32)c;
pix = pData + y * stride + x; pix = pData + y * stride + x;
} else { /* 03 .. 255 */ } else { /* 03 .. 255 */
int j; int j;
for (j = 0; (j < c) && (x < width) && for (j = 0; (j < c) && (x < width) &&
((OPJ_SIZE_T)pix < (OPJ_SIZE_T)beyond); j++, x++, pix++) { ((OPJ_SIZE_T)pix < (OPJ_SIZE_T)beyond); j++, x++, pix++) {
OPJ_UINT8 c1 = (OPJ_UINT8)getc(IN); int c1_int;
OPJ_UINT8 c1;
c1_int = getc(IN);
if (c1_int == EOF) {
return OPJ_FALSE;
}
c1 = (OPJ_UINT8)c1_int;
*pix = c1; *pix = c1;
} }
if ((OPJ_UINT32)c & 1U) { /* skip padding byte */ if ((OPJ_UINT32)c & 1U) { /* skip padding byte */
getc(IN); c = getc(IN);
if (c == EOF) {
return OPJ_FALSE;
}
} }
} }
} }