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

[trunk] correct issue 188 (thanks winfried) and add test about it. Fixes issue 188

This commit is contained in:
Mickael Savinaud 2013-03-17 18:16:03 +00:00
parent 07e6994be1
commit 1e414c8f37
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/lib/openjp2/jp2.c
View File

@ -428,12 +428,10 @@ static void opj_jp2_setup_decoding_validation (opj_jp2_t *jp2);
static void opj_jp2_setup_header_reading (opj_jp2_t *jp2); static void opj_jp2_setup_header_reading (opj_jp2_t *jp2);
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
OPJ_BOOL opj_jp2_read_boxhdr(opj_jp2_box_t *box, OPJ_BOOL opj_jp2_read_boxhdr(opj_jp2_box_t *box,
OPJ_UINT32 * p_number_bytes_read, OPJ_UINT32 * p_number_bytes_read,
opj_stream_private_t *cio, opj_stream_private_t *cio,
opj_event_mgr_t * p_manager opj_event_mgr_t * p_manager )
)
{ {
/* read header from file */ /* read header from file */
OPJ_BYTE l_data_header [8]; OPJ_BYTE l_data_header [8];
@ -453,6 +451,12 @@ static void opj_jp2_setup_header_reading (opj_jp2_t *jp2);
opj_read_bytes(l_data_header,&(box->length), 4); opj_read_bytes(l_data_header,&(box->length), 4);
opj_read_bytes(l_data_header+4,&(box->type), 4); opj_read_bytes(l_data_header+4,&(box->type), 4);
if(box->length == 0)/* last box */
{
box->length = opj_stream_get_number_byte_left(cio);
return OPJ_TRUE;
}
/* do we have a "special very large box ?" */ /* do we have a "special very large box ?" */
/* read then the XLBox */ /* read then the XLBox */
if (box->length == 1) { if (box->length == 1) {
@ -467,14 +471,15 @@ static void opj_jp2_setup_header_reading (opj_jp2_t *jp2);
return OPJ_FALSE; return OPJ_FALSE;
} }
*p_number_bytes_read = 16;
opj_read_bytes(l_data_header,&l_xl_part_size, 4); opj_read_bytes(l_data_header,&l_xl_part_size, 4);
if (l_xl_part_size != 0) { if (l_xl_part_size != 0) {
opj_event_msg(p_manager, EVT_ERROR, "Cannot handle box sizes higher than 2^32\n"); opj_event_msg(p_manager, EVT_ERROR, "Cannot handle box sizes higher than 2^32\n");
return OPJ_FALSE; return OPJ_FALSE;
} }
opj_read_bytes(l_data_header,&(box->length), 4); opj_read_bytes(l_data_header+4,&(box->length), 4);
} }
return OPJ_TRUE; return OPJ_TRUE;
} }
#if 0 #if 0

2
tests/nonregression/test_suite.ctest.in
View File

@ -89,6 +89,8 @@ opj_decompress -i @INPUT_NR_PATH@/mem-b2b86b74-2753.jp2 -o @TEMP_PATH@/mem-b2b8
! opj_decompress -i @INPUT_NR_PATH@/gdal_fuzzer_check_comp_dx_dy.jp2 -o @TEMP_PATH@/gdal_fuzzer_check_comp_dx_dy.pgx ! opj_decompress -i @INPUT_NR_PATH@/gdal_fuzzer_check_comp_dx_dy.jp2 -o @TEMP_PATH@/gdal_fuzzer_check_comp_dx_dy.pgx
# issue 202 # issue 202
opj_decompress -i @INPUT_NR_PATH@/file409752.jp2 -o @TEMP_PATH@/file409752.png opj_decompress -i @INPUT_NR_PATH@/file409752.jp2 -o @TEMP_PATH@/file409752.png
# issue 188
opj_decompress -i @INPUT_NR_PATH@/issue188_beach_64bitsbox.jp2 -o @TEMP_PATH@/issue188_beach_64bitsbox.jp2.tif
# decode with specific area # decode with specific area
# prec=12; nb_c=1 # prec=12; nb_c=1