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

[trunk] Now that issue 165 dataset is in non regression repository, activate code to reject them 

Fixes issue 165
This commit is contained in:
Mathieu Malaterre 2014-03-14 15:01:13 +00:00
parent de74605777
commit 7e1d012161
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/openjp2/j2k.c
View File

@ -3163,6 +3163,11 @@ static OPJ_BOOL opj_j2k_read_poc ( opj_j2k_t *p_j2k,
l_old_poc_nb = l_tcp->POC ? l_tcp->numpocs + 1 : 0; l_old_poc_nb = l_tcp->POC ? l_tcp->numpocs + 1 : 0;
l_current_poc_nb += l_old_poc_nb; l_current_poc_nb += l_old_poc_nb;
if(l_current_poc_nb >= 32)
{
opj_event_msg(p_manager, EVT_ERROR, "Too many POCs %d\n", l_current_poc_nb);
return OPJ_FALSE;
}
assert(l_current_poc_nb < 32); assert(l_current_poc_nb < 32);
/* now poc is in use.*/ /* now poc is in use.*/

1
tests/nonregression/CMakeLists.txt
View File

@ -25,6 +25,7 @@ set(BLACKLIST_JPEG2000_TMP
26ccf3651020967f7778238ef5af08af.SIGFPE.d25.527.jp2 26ccf3651020967f7778238ef5af08af.SIGFPE.d25.527.jp2
4035.pdf.SIGSEGV.d8b.3375.jp2 4035.pdf.SIGSEGV.d8b.3375.jp2
3635.pdf.asan.77.2930.jp2 3635.pdf.asan.77.2930.jp2
issue165.jp2
) )
# Define a list of file which should be gracefully rejected: # Define a list of file which should be gracefully rejected:

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

@ -142,6 +142,8 @@ opj_decompress -i @INPUT_NR_PATH@/issue208.jp2 -o @TEMP_PATH@/i
opj_decompress -i @INPUT_NR_PATH@/issue211.jp2 -o @TEMP_PATH@/issue211.jp2.pgx opj_decompress -i @INPUT_NR_PATH@/issue211.jp2 -o @TEMP_PATH@/issue211.jp2.pgx
# issue 171 # issue 171
opj_decompress -i @INPUT_NR_PATH@/issue171.jp2 -o @TEMP_PATH@/issue171.jp2.pgx opj_decompress -i @INPUT_NR_PATH@/issue171.jp2 -o @TEMP_PATH@/issue171.jp2.pgx
# issue 171
!opj_decompress -i @INPUT_NR_PATH@/issue165.jp2 -o @TEMP_PATH@/issue165.jp2.pgx
# decode with specific area # decode with specific area
# prec=12; nb_c=1 # prec=12; nb_c=1