Fix memory leak in opj_j2k_merge_ppt.

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 3789 matching lines @@
  *
  * @param       p_tcp   the tile.
  * @param       p_manager               the user event manager.
  */
 static OPJ_BOOL opj_j2k_merge_ppt(opj_tcp_t *p_tcp, opj_event_mgr_t * p_manager)
 {
         OPJ_UINT32 i, l_ppt_data_size;
         /* preconditions */
         assert(p_tcp != 00);
         assert(p_manager != 00);
-        assert(p_tcp->ppt_buffer == NULL);
+        
+        if(p_tcp->ppt_buffer != NULL) {

[dsinclair, 2016/09/19 12:59:01]

Have we verified this can ever happen? It's a precondition that ppt_buffer is
NULL coming into this method, so the callers should be verifying that the buffer
is NULL before making the call.

Can we take a look at the callers to determine if they are doing this check,
instead of changing the assert here.

+                return OPJ_FALSE;
+        }
         
         if (p_tcp->ppt == 0U) {
                 return OPJ_TRUE;
         }
         
         l_ppt_data_size = 0U;
         for (i = 0U; i < p_tcp->ppt_markers_count; ++i) {
                 l_ppt_data_size += p_tcp->ppt_markers[i].m_data_size; /* can't overflow, max 256 markers of max 65536 bytes */
         }
         
@@ skipping 6997 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;
 }