diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2017-07-29 16:22:36 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2017-07-29 16:22:36 +0200 |
| commit | 9906fbf737692486cebabe98169988d818e2e66a (patch) | |
| tree | ea5cf61e6dcce9102ccae90afe8d6df9761e12a5 /src/lib | |
| parent | 71b4f5b124d14ed609763b11e19d2d480bc32f58 (diff) | |
Avoid assertion in opj_j2k_merge_ppt() in case premature EOC is encountered in opj_j2k_read_tile_header(). Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2785. Credit to OSS Fuzz
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/openjp2/j2k.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c index b192f04f..3d90de1e 100644 --- a/src/lib/openjp2/j2k.c +++ b/src/lib/openjp2/j2k.c @@ -8618,10 +8618,7 @@ OPJ_BOOL opj_j2k_read_tile_header(opj_j2k_t * p_j2k, /* Current marker is the EOC marker ?*/ if (l_current_marker == J2K_MS_EOC) { - if (p_j2k->m_specific_param.m_decoder.m_state != J2K_STATE_EOC) { - p_j2k->m_current_tile_number = 0; - p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_EOC; - } + p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_EOC; } /* FIXME DOC ???*/ |