From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 20 Jun 2018 12:38:41 +0000 (+0200)
Subject: Revert "Avoid assertion in opj_j2k_merge_ppt() in case premature EOC is encountered... 
X-Git-Tag: v2.3.1~30^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=832dfd18665da08745748bde2d2563f00c7cd9e7;p=openjpeg

Revert "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" (fixes #1120)

This reverts commit 9906fbf737692486cebabe98169988d818e2e66a.
which broke decoding of images where TNsot == 0
---

diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c
index 6e9cf8ce..5109931f 100644
--- a/src/lib/openjp2/j2k.c
+++ b/src/lib/openjp2/j2k.c
@@ -8845,7 +8845,10 @@ 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) {
-        p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_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;
+        }
     }
 
     /* FIXME DOC ???*/