Fix a memory leak in opj_jp2_read_ihdr().

third_party/libopenjpeg20/jp2.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 543 matching lines @@
         }
 
         opj_read_bytes(p_image_header_data,&(jp2->h),4);                        /* HEIGHT */
         p_image_header_data += 4;
         opj_read_bytes(p_image_header_data,&(jp2->w),4);                        /* WIDTH */
         p_image_header_data += 4;
         opj_read_bytes(p_image_header_data,&(jp2->numcomps),2);         /* NC */
         p_image_header_data += 2;
 
         /* allocate memory for components */
+        opj_free(jp2->comps);
         jp2->comps = (opj_jp2_comps_t*) opj_calloc(jp2->numcomps, sizeof(opj_jp2_comps_t));
         if (jp2->comps == 0) {
                 opj_event_msg(p_manager, EVT_ERROR, "Not enough memory to handle image header (ihdr)\n");
                 return OPJ_FALSE;
         }
 
         opj_read_bytes(p_image_header_data,&(jp2->bpc),1);                      /* BPC */
         ++ p_image_header_data;
 
         opj_read_bytes(p_image_header_data,&(jp2->C),1);                        /* C */
@@ skipping 1177 matching lines @@
 /* JP2 decoder interface                                             */
 /* ----------------------------------------------------------------------- */
 
 void opj_jp2_setup_decoder(opj_jp2_t *jp2, opj_dparameters_t *parameters)
 {
         /* setup the J2K codec */
         opj_j2k_setup_decoder(jp2->j2k, parameters);
 
         /* further JP2 initializations go here */
         jp2->color.jp2_has_colr = 0;
+        jp2->comps = NULL;
     jp2->ignore_pclr_cmap_cdef = parameters->flags & OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG;
 }
 
 /* ----------------------------------------------------------------------- */
 /* JP2 encoder interface                                             */
 /* ----------------------------------------------------------------------- */
 
 OPJ_BOOL opj_jp2_setup_encoder( opj_jp2_t *jp2,
                             opj_cparameters_t *parameters,
                             opj_image_t *image,
@@ skipping 37 matching lines @@
                 opj_event_msg(p_manager, EVT_ERROR, "Not enough memory when setup the JP2 encoder\n");
                 return OPJ_FALSE;
         }
         jp2->cl[0] = JP2_JP2;   /* CL0 : JP2 */
 
         /* Image Header box */
 
         jp2->numcomps = image->numcomps;        /* NC */
         jp2->comps = (opj_jp2_comps_t*) opj_malloc(jp2->numcomps * sizeof(opj_jp2_comps_t));
         if (!jp2->comps) {
-                jp2->comps = NULL;
                 opj_event_msg(p_manager, EVT_ERROR, "Not enough memory when setup the JP2 encoder\n");
                 /* Memory of jp2->cl will be freed by opj_jp2_destroy */
                 return OPJ_FALSE;
         }
 
         jp2->h = image->y1 - image->y0;         /* HEIGHT */
         jp2->w = image->x1 - image->x0;         /* WIDTH */
         /* BPC */
         depth_0 = image->comps[0].prec - 1;
         sign = image->comps[0].sgnd;
@@ skipping 1324 matching lines @@
   len = opj_stream_tell(cio)-lenp;
   opj_stream_skip(cio, lenp, p_manager);
   opj_write_bytes(l_data_header,len,4);/* L              */
   opj_stream_write_data(cio,l_data_header,4,p_manager);
   opj_stream_seek(cio, lenp+len,p_manager);
 
   return len;
 }
 #endif
 #endif /* USE_JPIP */