Merge to XFA: openjpeg: fix incrementing of "l_tcp->m_nb_mcc_records" in opj_j2k_read_mcc

third_party/libopenjpeg20/j2k.c

 /*
  * The copyright in this software is being made available under the 2-clauses 
  * BSD License, included below. This software may be subject to other third 
  * party and contributor rights, including patent rights, and no such rights
  * are granted under this license.
  *
  * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
@@ skipping 5323 matching lines @@
 {
         OPJ_UINT32 i,j;
         OPJ_UINT32 l_tmp;
         OPJ_UINT32 l_indix;
         opj_tcp_t * l_tcp;
         opj_simple_mcc_decorrelation_data_t * l_mcc_record;
         opj_mct_data_t * l_mct_data;
         OPJ_UINT32 l_nb_collections;
         OPJ_UINT32 l_nb_comps;
         OPJ_UINT32 l_nb_bytes_by_comp;
+        OPJ_BOOL new_mcc = OPJ_FALSE;
 
         /* preconditions */
         assert(p_header_data != 00);
         assert(p_j2k != 00);
         assert(p_manager != 00);
 
         l_tcp = p_j2k->m_specific_param.m_decoder.m_state == J2K_STATE_TPH ?
                         &p_j2k->m_cp.tcps[p_j2k->m_current_tile_number] :
                         p_j2k->m_specific_param.m_decoder.m_default_tcp;
 
@@ skipping 41 matching lines @@
                                 l_tcp->m_nb_max_mcc_records = 0;
                                 l_tcp->m_nb_mcc_records = 0;
                                 opj_event_msg(p_manager, EVT_ERROR, "Not enough memory to read MCC marker\n");
                                 return OPJ_FALSE;
                         }
                         l_tcp->m_mcc_records = new_mcc_records;
                         l_mcc_record = l_tcp->m_mcc_records + l_tcp->m_nb_mcc_records;
                         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;
+                new_mcc = OPJ_TRUE;
         }
         l_mcc_record->m_index = l_indix;
 
         /* only one marker atm */
         opj_read_bytes(p_header_data,&l_tmp,2);                         /* Ymcc */
         p_header_data+=2;
         if (l_tmp != 0) {
                 opj_event_msg(p_manager, EVT_WARNING, "Cannot take in charge multiple data spanning\n");
                 return OPJ_TRUE;
         }
@@ skipping 115 matching lines @@
                                 return OPJ_FALSE;
                         }
                 }
         }
 
         if (p_header_size != 0) {
                 opj_event_msg(p_manager, EVT_ERROR, "Error reading MCC marker\n");
                 return OPJ_FALSE;
         }
 
-        ++l_tcp->m_nb_mcc_records;
+        if (new_mcc) {
+                ++l_tcp->m_nb_mcc_records;
+        }
 
         return OPJ_TRUE;
 }
 
 static OPJ_BOOL opj_j2k_write_mco(     opj_j2k_t *p_j2k,
                                                 struct opj_stream_private *p_stream,
                                                 struct opj_event_mgr * p_manager
                                   )
 {
         OPJ_BYTE * l_current_data = 00;
@@ skipping 5249 matching lines @@
                         return OPJ_FALSE;
                 }
                 if (! opj_j2k_post_write_tile(p_j2k,p_stream,p_manager)) {
                         opj_event_msg(p_manager, EVT_ERROR, "Error while opj_j2k_post_write_tile with tile index = %d\n", p_tile_index);
                         return OPJ_FALSE;
                 }
         }
 
         return OPJ_TRUE;
 }