diff options
| author | Antonin Descampe <antonin@gmail.com> | 2015-09-15 15:42:17 +0200 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2015-09-15 15:42:17 +0200 |
| commit | 2e508f1c89b6de9cf3f03c2b51d064839d455ebf (patch) | |
| tree | 5e174ed0c29232a4ed7f45edbde7748839984831 | |
| parent | f8013bec95e07e456cc43a31699d66fa97998772 (diff) | |
backport issue #80 to 1.5 branch
| -rw-r--r-- | libopenjpeg/j2k.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c index c3635964..a4a17ff2 100644 --- a/libopenjpeg/j2k.c +++ b/libopenjpeg/j2k.c @@ -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 */ |