commit 1baea68bcd98a0941e5b3ba00853d8dbbd581668
author Matthieu Darbois <mayeut@users.noreply.github.com> Tue Sep 06 22:33:26 2016 +0200
committer Dirk Vogt <dirk@fairphone.com> Tue May 16 10:29:48 2017 +0200
tree 7915e030d169d44e71bdfbb9019e75fb010c0301
parent 58e836f0184e84365d2496eebdeba5855b0dd380

Backport 734d57d5f7842aa7c2c9f36d62131ab4d8bd6c87 from libopenjpeg20

Original commit message:

> fix incrementing of "l_tcp->m_nb_mcc_records" in opj_j2k_read_mcc (#820)

FPIIM-794

Bug: 35443562
Change-Id: I799f94c4f5c909c66dcedfbbbf79775ed46f3981
(cherry picked from commit 3e2c4b9394f61fdc9aac65d2a9e288be6095ee2d)

core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c

diff --git a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c
index 7b4bc58..e545819 100644
--- a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c
+++ b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c
@@ -5398,6 +5398,7 @@
         OPJ_UINT32 l_nb_collections;
         OPJ_UINT32 l_nb_comps;
         OPJ_UINT32 l_nb_bytes_by_comp;
+        OPJ_BOOL l_new_mcc = OPJ_FALSE;
 
         /* preconditions */
         assert(p_header_data != 00);
@@ -5459,6 +5460,7 @@
                         memset(l_mcc_record,0,(l_tcp->m_nb_max_mcc_records-l_tcp->m_nb_mcc_records) * sizeof(opj_simple_mcc_decorrelation_data_t));
                 }
                 l_mcc_record = l_tcp->m_mcc_records + l_tcp->m_nb_mcc_records;
+                l_new_mcc = OPJ_TRUE;
         }
         l_mcc_record->m_index = l_indix;
 
@@ -5594,7 +5596,9 @@
                 return OPJ_FALSE;
         }
 
-        ++l_tcp->m_nb_mcc_records;
+        if (l_new_mcc) {
+                ++l_tcp->m_nb_mcc_records;
+        }
 
         return OPJ_TRUE;
 }