diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2014-03-12 10:10:21 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2014-03-12 10:10:21 +0000 |
| commit | 6b51d11d085753c64fb7c2908068730bcf95d5cf (patch) | |
| tree | 400792f5f79358e4118b79bfb85bf0ec1fbf81b7 /src/lib | |
| parent | 59270c39a7357c777e7c9ba90b8c14a40e282d68 (diff) | |
[trunk] Make sure when reading POC that number of layers (layer end) is within acceptable bound.
Fixes issue 80
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/openjp2/j2k.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c index 466e61b2..ce5ef77f 100644 --- a/src/lib/openjp2/j2k.c +++ b/src/lib/openjp2/j2k.c @@ -3175,6 +3175,8 @@ static OPJ_BOOL opj_j2k_read_poc ( opj_j2k_t *p_j2k, opj_read_bytes(p_header_data,&(l_current_poc->compno0),l_comp_room); /* CSpoc_i */ p_header_data+=l_comp_room; opj_read_bytes(p_header_data,&(l_current_poc->layno1),2); /* LYEpoc_i */ + /* make sure layer end is in acceptable bounds */ + l_current_poc->layno1 = opj_uint_min(l_current_poc->layno1, l_tcp->numlayers); p_header_data+=2; opj_read_bytes(p_header_data,&(l_current_poc->resno1),1); /* REpoc_i */ ++p_header_data; |