diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2013-02-02 17:11:25 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2013-02-02 17:11:25 +0000 |
| commit | a1bbdf0d0fcd18451202e0ec1f4996668cfec998 (patch) | |
| tree | 6c15fc80166638430674b79bca40c141bd9495ae /src/lib/openjp2/j2k.c | |
| parent | 7920f9d54f7e168c6ac1fe0f1f8136f97e1d4764 (diff) | |
[b2.x.x] backport into 2.x.x the rev 2237 of trunk
Diffstat (limited to 'src/lib/openjp2/j2k.c')
| -rw-r--r-- | src/lib/openjp2/j2k.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c index 2fda7385..dccab6de 100644 --- a/src/lib/openjp2/j2k.c +++ b/src/lib/openjp2/j2k.c @@ -2823,6 +2823,13 @@ static OPJ_BOOL opj_j2k_read_qcc( opj_j2k_t *p_j2k, }; #endif /* USE_JPWL */ + if (l_comp_no >= p_j2k->m_private_image->numcomps) { + opj_event_msg(p_manager, EVT_ERROR, + "Invalid component number: %d, regarding the number of components %d\n", + l_comp_no, p_j2k->m_private_image->numcomps); + return OPJ_FALSE; + } + if (! opj_j2k_read_SQcd_SQcc(p_j2k,l_comp_no,p_header_data,&p_header_size,p_manager)) { opj_event_msg(p_manager, EVT_ERROR, "Error reading QCC marker\n"); return OPJ_FALSE; |