backport issue #80 to 1.5 branch

This commit is contained in:
Antonin Descampe 2015-09-15 15:42:17 +02:00
parent f8013bec95
commit 2e508f1c89
1 changed files with 2 additions and 0 deletions

View File

@ -1125,6 +1125,8 @@ static void j2k_read_poc(opj_j2k_t *j2k) {
poc->resno0 = cio_read(cio, 1); /* RSpoc_i */
poc->compno0 = cio_read(cio, numcomps <= 256 ? 1 : 2); /* CSpoc_i */
poc->layno1 = cio_read(cio, 2); /* LYEpoc_i */
/* make sure layer end is in acceptable bounds - issue 80*/
poc->layno1 = int_min(poc->layno1, (unsigned int) tcp->numlayers);
poc->resno1 = cio_read(cio, 1); /* REpoc_i */
poc->compno1 = int_min(
cio_read(cio, numcomps <= 256 ? 1 : 2), (unsigned int) numcomps); /* CEpoc_i */