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

[1.5] jp2_read_boxhdr() call ignores return value 

Fixes issue 91
This commit is contained in:
Mathieu Malaterre 2012-05-29 17:49:11 +00:00
parent b8fecbbc99
commit 8062f74deb
1 changed files with 85 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

157
libopenjpeg/jp2.c
View File

@ -206,7 +206,10 @@ static opj_bool jp2_read_ihdr(opj_jp2_t *jp2, opj_cio_t *cio) {
opj_common_ptr cinfo = jp2->cinfo; opj_common_ptr cinfo = jp2->cinfo;
jp2_read_boxhdr(cinfo, cio, &box); if(jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) {
opj_event_msg(cinfo, EVT_ERROR, "Failed to read boxhdr\n");
return OPJ_FALSE;
}
if (JP2_IHDR != box.type) { if (JP2_IHDR != box.type) {
opj_event_msg(cinfo, EVT_ERROR, "Expected IHDR Marker\n"); opj_event_msg(cinfo, EVT_ERROR, "Expected IHDR Marker\n");
return OPJ_FALSE; return OPJ_FALSE;
@ -279,7 +282,10 @@ static opj_bool jp2_read_bpcc(opj_jp2_t *jp2, opj_cio_t *cio) {
opj_common_ptr cinfo = jp2->cinfo; opj_common_ptr cinfo = jp2->cinfo;
jp2_read_boxhdr(cinfo, cio, &box); if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) {
opj_event_msg(cinfo, EVT_ERROR, "Failed to read boxhdr\n");
return OPJ_FALSE;
}
if (JP2_BPCC != box.type) { if (JP2_BPCC != box.type) {
opj_event_msg(cinfo, EVT_ERROR, "Expected BPCC Marker\n"); opj_event_msg(cinfo, EVT_ERROR, "Expected BPCC Marker\n");
return OPJ_FALSE; return OPJ_FALSE;
@ -639,87 +645,86 @@ opj_bool jp2_read_jp2h(opj_jp2_t *jp2, opj_cio_t *cio, opj_jp2_color_t *color)
opj_common_ptr cinfo = jp2->cinfo; opj_common_ptr cinfo = jp2->cinfo;
jp2_read_boxhdr(cinfo, cio, &box); if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
do do {
{ if (JP2_JP2H != box.type)
if (JP2_JP2H != box.type) {
{ if (box.type == JP2_JP2C)
if (box.type == JP2_JP2C) {
{ opj_event_msg(cinfo, EVT_ERROR, "Expected JP2H Marker\n");
opj_event_msg(cinfo, EVT_ERROR, "Expected JP2H Marker\n"); return OPJ_FALSE;
return OPJ_FALSE; }
} cio_skip(cio, box.length - 8);
cio_skip(cio, box.length - 8);
if(cio->bp >= cio->end) return OPJ_FALSE; if(cio->bp >= cio->end) return OPJ_FALSE;
jp2_read_boxhdr(cinfo, cio, &box); if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
} }
} while(JP2_JP2H != box.type); } while(JP2_JP2H != box.type);
if (!jp2_read_ihdr(jp2, cio)) if (!jp2_read_ihdr(jp2, cio))
return OPJ_FALSE; return OPJ_FALSE;
jp2h_end = box.init_pos + box.length; jp2h_end = box.init_pos + box.length;
if (jp2->bpc == 255) if (jp2->bpc == 255)
{ {
if (!jp2_read_bpcc(jp2, cio)) if (!jp2_read_bpcc(jp2, cio))
return OPJ_FALSE; return OPJ_FALSE;
} }
jp2_read_boxhdr(cinfo, cio, &box); if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
while(cio_tell(cio) < jp2h_end) while(cio_tell(cio) < jp2h_end)
{ {
if(box.type == JP2_COLR) if(box.type == JP2_COLR)
{ {
if( !jp2_read_colr(jp2, cio, &box, color)) if( !jp2_read_colr(jp2, cio, &box, color))
{ {
cio_seek(cio, box.init_pos + 8); cio_seek(cio, box.init_pos + 8);
cio_skip(cio, box.length - 8); cio_skip(cio, box.length - 8);
} }
jp2_read_boxhdr(cinfo, cio, &box); if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
continue; continue;
} }
if(box.type == JP2_CDEF && !jp2->ignore_pclr_cmap_cdef) if(box.type == JP2_CDEF && !jp2->ignore_pclr_cmap_cdef)
{ {
if( !jp2_read_cdef(jp2, cio, &box, color)) if( !jp2_read_cdef(jp2, cio, &box, color))
{ {
cio_seek(cio, box.init_pos + 8); cio_seek(cio, box.init_pos + 8);
cio_skip(cio, box.length - 8); cio_skip(cio, box.length - 8);
} }
jp2_read_boxhdr(cinfo, cio, &box); if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
continue; continue;
} }
if(box.type == JP2_PCLR && !jp2->ignore_pclr_cmap_cdef) if(box.type == JP2_PCLR && !jp2->ignore_pclr_cmap_cdef)
{ {
if( !jp2_read_pclr(jp2, cio, &box, color)) if( !jp2_read_pclr(jp2, cio, &box, color))
{ {
cio_seek(cio, box.init_pos + 8); cio_seek(cio, box.init_pos + 8);
cio_skip(cio, box.length - 8); cio_skip(cio, box.length - 8);
} }
jp2_read_boxhdr(cinfo, cio, &box); if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
continue; continue;
} }
if(box.type == JP2_CMAP && !jp2->ignore_pclr_cmap_cdef) if(box.type == JP2_CMAP && !jp2->ignore_pclr_cmap_cdef)
{ {
if( !jp2_read_cmap(jp2, cio, &box, color)) if( !jp2_read_cmap(jp2, cio, &box, color))
{ {
cio_seek(cio, box.init_pos + 8);
cio_skip(cio, box.length - 8);
}
if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
continue;
}
cio_seek(cio, box.init_pos + 8); cio_seek(cio, box.init_pos + 8);
cio_skip(cio, box.length - 8); cio_skip(cio, box.length - 8);
} if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
jp2_read_boxhdr(cinfo, cio, &box);
continue;
}
cio_seek(cio, box.init_pos + 8);
cio_skip(cio, box.length - 8);
jp2_read_boxhdr(cinfo, cio, &box);
}/* while(cio_tell(cio) < box_end) */ }/* while(cio_tell(cio) < box_end) */
cio_seek(cio, jp2h_end); cio_seek(cio, jp2h_end);
/* Part 1, I.5.3.3 : 'must contain at least one' */ /* Part 1, I.5.3.3 : 'must contain at least one' */
return (color->jp2_has_colr == 1); return (color->jp2_has_colr == 1);
}/* jp2_read_jp2h() */ }/* jp2_read_jp2h() */
@ -839,8 +844,10 @@ static opj_bool jp2_read_ftyp(opj_jp2_t *jp2, opj_cio_t *cio) {
opj_common_ptr cinfo = jp2->cinfo; opj_common_ptr cinfo = jp2->cinfo;
jp2_read_boxhdr(cinfo, cio, &box); if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) {
opj_event_msg(cinfo, EVT_ERROR, "Failed to read boxhdr\n");
return OPJ_FALSE;
}
if (JP2_FTYP != box.type) { if (JP2_FTYP != box.type) {
opj_event_msg(cinfo, EVT_ERROR, "Expected FTYP Marker\n"); opj_event_msg(cinfo, EVT_ERROR, "Expected FTYP Marker\n");
return OPJ_FALSE; return OPJ_FALSE;
@ -897,11 +904,14 @@ static opj_bool jp2_read_jp2c(opj_jp2_t *jp2, opj_cio_t *cio, unsigned int *j2k_
opj_common_ptr cinfo = jp2->cinfo; opj_common_ptr cinfo = jp2->cinfo;
jp2_read_boxhdr(cinfo, cio, &box); if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) {
opj_event_msg(cinfo, EVT_ERROR, "Failed to read boxhdr\n");
return OPJ_FALSE;
}
do { do {
if(JP2_JP2C != box.type) { if(JP2_JP2C != box.type) {
cio_skip(cio, box.length - 8); cio_skip(cio, box.length - 8);
jp2_read_boxhdr(cinfo, cio, &box); if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
} }
} while(JP2_JP2C != box.type); } while(JP2_JP2C != box.type);
@ -930,7 +940,10 @@ static opj_bool jp2_read_jp(opj_jp2_t *jp2, opj_cio_t *cio) {
opj_common_ptr cinfo = jp2->cinfo; opj_common_ptr cinfo = jp2->cinfo;
jp2_read_boxhdr(cinfo, cio, &box); if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) {
opj_event_msg(cinfo, EVT_ERROR, "Failed to read boxhdr\n");
return OPJ_FALSE;
}
if (JP2_JP != box.type) { if (JP2_JP != box.type) {
opj_event_msg(cinfo, EVT_ERROR, "Expected JP Marker\n"); opj_event_msg(cinfo, EVT_ERROR, "Expected JP Marker\n");
return OPJ_FALSE; return OPJ_FALSE;