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

bmp_read_rle4_data(): avoid potential infinite loop

This commit is contained in:
Young Xiao 2019-03-16 20:09:59 +08:00 committed by Young Xiao
parent 21399f6b7d
commit 3aef207f90
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -632,12 +632,18 @@ static OPJ_BOOL bmp_read_rle4_data(FILE* IN, OPJ_UINT8* pData,
while (y < height) { while (y < height) {
int c = getc(IN); int c = getc(IN);
if (c == EOF) { if (c == EOF) {
break; return OPJ_FALSE;
} }
if (c) { /* encoded mode */ if (c) { /* encoded mode */
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++) {
@ -647,7 +653,7 @@ static OPJ_BOOL bmp_read_rle4_data(FILE* IN, OPJ_UINT8* pData,
} else { /* absolute mode */ } else { /* absolute mode */
c = getc(IN); c = getc(IN);
if (c == EOF) { if (c == EOF) {
break; return OPJ_FALSE;
} }
if (c == 0x00) { /* EOL */ if (c == 0x00) { /* EOL */
@ -658,8 +664,14 @@ static OPJ_BOOL bmp_read_rle4_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 : absolute mode */ } else { /* 03 .. 255 : absolute mode */
@ -669,13 +681,21 @@ static OPJ_BOOL bmp_read_rle4_data(FILE* IN, OPJ_UINT8* pData,
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++) {
if ((j & 1) == 0) { if ((j & 1) == 0) {
c1 = (OPJ_UINT8)getc(IN); int c1_int;
c1_int = getc(IN);
if (c1_int == EOF) {
return OPJ_FALSE;
}
c1 = (OPJ_UINT8)c1_int;
} }
*pix = (OPJ_UINT8)((j & 1) ? (c1 & 0x0fU) : ((c1 >> 4) & 0x0fU)); *pix = (OPJ_UINT8)((j & 1) ? (c1 & 0x0fU) : ((c1 >> 4) & 0x0fU));
written++; written++;
} }
if (((c & 3) == 1) || ((c & 3) == 2)) { /* skip padding byte */ if (((c & 3) == 1) || ((c & 3) == 2)) { /* skip padding byte */
getc(IN); c = getc(IN);
if (c == EOF) {
return OPJ_FALSE;
}
} }
} }
} }