diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-12-02 10:05:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-02 10:05:39 +0100 |
| commit | 18b1138fbe3bb0ae4aa2bf1369f9430a8ec6fa00 (patch) | |
| tree | 7378039e0fc7ccaa6dbec2293c72715d557d5f9a /src | |
| parent | 630b485f86a6b0bb6fa03b698b8c5358df88d055 (diff) | |
| parent | c9380ed0f8cc4794fc71d556ea23ae61e32247af (diff) | |
Merge pull request #1295 from rouault/fix_1293
opj_j2k_setup_encoder(): validate POC compno0 and compno1 (fixes #1293)
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/openjp2/j2k.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c index d9d650e1..78d45925 100644 --- a/src/lib/openjp2/j2k.c +++ b/src/lib/openjp2/j2k.c @@ -7945,11 +7945,18 @@ OPJ_BOOL opj_j2k_setup_encoder(opj_j2k_t *p_j2k, if (tileno + 1 == parameters->POC[i].tile) { opj_poc_t *tcp_poc = &tcp->pocs[numpocs_tile]; + if (parameters->POC[numpocs_tile].compno0 >= image->numcomps) { + opj_event_msg(p_manager, EVT_ERROR, + "Invalid compno0 for POC %d\n", i); + return OPJ_FALSE; + } + tcp_poc->resno0 = parameters->POC[numpocs_tile].resno0; tcp_poc->compno0 = parameters->POC[numpocs_tile].compno0; tcp_poc->layno1 = parameters->POC[numpocs_tile].layno1; tcp_poc->resno1 = parameters->POC[numpocs_tile].resno1; - tcp_poc->compno1 = parameters->POC[numpocs_tile].compno1; + tcp_poc->compno1 = opj_uint_min(parameters->POC[numpocs_tile].compno1, + image->numcomps); tcp_poc->prg1 = parameters->POC[numpocs_tile].prg1; tcp_poc->tile = parameters->POC[numpocs_tile].tile; |