Update openjpeg

core/src/fxcodec/fx_libopenjpeg/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 519 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 */
-        jp2->comps = (opj_jp2_comps_t*) opj_malloc(jp2->numcomps * sizeof(opj_jp2_comps_t));
+        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;
         }
-        memset(jp2->comps,0,jp2->numcomps * sizeof(opj_jp2_comps_t));
 
         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 */
         ++ p_image_header_data;
 
         /* Should be equal to 7 cf. chapter about image header box of the norm */
         if (jp2->C != 7){
                 opj_event_msg(p_manager, EVT_INFO, "JP2 IHDR box: compression type indicate that the file is not a conforming JP2 file (%d) \n", jp2->C);
@@ skipping 11 matching lines @@
                               OPJ_UINT32 * p_nb_bytes_written
                               )
 {
         OPJ_BYTE * l_ihdr_data,* l_current_ihdr_ptr;
         
         /* preconditions */
         assert(jp2 != 00);
         assert(p_nb_bytes_written != 00);
 
         /* default image header is 22 bytes wide */
-        l_ihdr_data = (OPJ_BYTE *) opj_malloc(22);
+        l_ihdr_data = (OPJ_BYTE *) opj_calloc(1,22);
         if (l_ihdr_data == 00) {
                 return 00;
         }
-        memset(l_ihdr_data,0,22);
 
         l_current_ihdr_ptr = l_ihdr_data;
         
         opj_write_bytes(l_current_ihdr_ptr,22,4);                               /* write box size */
         l_current_ihdr_ptr+=4;
 
         opj_write_bytes(l_current_ihdr_ptr,JP2_IHDR, 4);                /* IHDR */
         l_current_ihdr_ptr+=4;
         
         opj_write_bytes(l_current_ihdr_ptr,jp2->h, 4);          /* HEIGHT */
@@ skipping 28 matching lines @@
 {
         OPJ_UINT32 i;
         /* room for 8 bytes for box and 1 byte for each component */
         OPJ_UINT32 l_bpcc_size = 8 + jp2->numcomps;
         OPJ_BYTE * l_bpcc_data,* l_current_bpcc_ptr;
         
         /* preconditions */
         assert(jp2 != 00);
         assert(p_nb_bytes_written != 00);
 
-        l_bpcc_data = (OPJ_BYTE *) opj_malloc(l_bpcc_size);
+        l_bpcc_data = (OPJ_BYTE *) opj_calloc(1,l_bpcc_size);
         if (l_bpcc_data == 00) {
                 return 00;
         }
-        memset(l_bpcc_data,0,l_bpcc_size);
 
         l_current_bpcc_ptr = l_bpcc_data;
 
         opj_write_bytes(l_current_bpcc_ptr,l_bpcc_size,4);                              /* write box size */
         l_current_bpcc_ptr += 4;
         
         opj_write_bytes(l_current_bpcc_ptr,JP2_BPCC,4);                                 /* BPCC */
         l_current_bpcc_ptr += 4;
 
         for (i = 0; i < jp2->numcomps; ++i)  {
@@ skipping 57 matching lines @@
                         l_colr_size += 4; /* EnumCS */
                         break;
                 case 2 :
             assert(jp2->color.icc_profile_len); /* ICC profile */
             l_colr_size += jp2->color.icc_profile_len;
                         break;
                 default :
                         return 00;
         }
 
-        l_colr_data = (OPJ_BYTE *) opj_malloc(l_colr_size);
+        l_colr_data = (OPJ_BYTE *) opj_calloc(1,l_colr_size);
         if (l_colr_data == 00) {
                 return 00;
         }
-        memset(l_colr_data,0,l_colr_size);
         
         l_current_colr_ptr = l_colr_data;
 
         opj_write_bytes(l_current_colr_ptr,l_colr_size,4);                              /* write box size */
         l_current_colr_ptr += 4;
         
         opj_write_bytes(l_current_colr_ptr,JP2_COLR,4);                                 /* BPCC */
         l_current_colr_ptr += 4;
         
         opj_write_bytes(l_current_colr_ptr, jp2->meth,1);                               /* METH */
@@ skipping 125 matching lines @@
 
         channel_size = color->jp2_pclr->channel_size;
         channel_sign = color->jp2_pclr->channel_sign;
         entries = color->jp2_pclr->entries;
         cmap = color->jp2_pclr->cmap;
         nr_channels = color->jp2_pclr->nr_channels;
 
         old_comps = image->comps;
         new_comps = (opj_image_comp_t*)
                         opj_malloc(nr_channels * sizeof(opj_image_comp_t));
-
+        if (!new_comps) {
+                /* FIXME no error code for opj_jp2_apply_pclr */
+                /* FIXME event manager error callback */
+                return;
+        }
         for(i = 0; i < nr_channels; ++i) {
                 pcol = cmap[i].pcol; cmp = cmap[i].cmp;
 
                 /* Direct use */
     if(cmap[i].mtyp == 0){
       assert( pcol == 0 );
       new_comps[i] = old_comps[cmp];
     } else {
       assert( i == pcol );
       new_comps[pcol] = old_comps[cmp];
     }
 
                 /* Palette mapping: */
                 new_comps[i].data = (OPJ_INT32*)
                                 opj_malloc(old_comps[cmp].w * old_comps[cmp].h * sizeof(OPJ_INT32));
+                if (!new_comps[i].data) {
+                        opj_free(new_comps);
+                        new_comps = NULL;
+                        /* FIXME no error code for opj_jp2_apply_pclr */
+                        /* FIXME event manager error callback */
+                        return;
+                }
                 new_comps[i].prec = channel_size[i];
                 new_comps[i].sgnd = channel_sign[i];
         }
 
         top_k = color->jp2_pclr->nr_entries - 1;
 
         for(i = 0; i < nr_channels; ++i) {
                 /* Palette mapping: */
                 cmp = cmap[i].cmp; pcol = cmap[i].pcol;
                 src = old_comps[cmp].data;
@@ skipping 341 matching lines @@
         opj_read_bytes(p_colr_header_data,&jp2->meth ,1);                       /* METH */
         ++p_colr_header_data;
 
         opj_read_bytes(p_colr_header_data,&jp2->precedence ,1);         /* PRECEDENCE */
         ++p_colr_header_data;
 
         opj_read_bytes(p_colr_header_data,&jp2->approx ,1);                     /* APPROX */
         ++p_colr_header_data;
 
         if (jp2->meth == 1) {
+                if (p_colr_header_size < 7) {
+                        opj_event_msg(p_manager, EVT_ERROR, "Bad COLR header box (bad size: %d)\n", p_colr_header_size);
+                        return OPJ_FALSE;
+                }
                 if (p_colr_header_size > 7) {
                         /* testcase Altona_Technical_v20_x4.pdf */
                         opj_event_msg(p_manager, EVT_WARNING, "Bad COLR header box (bad size: %d)\n", p_colr_header_size);
                 }
 
                 opj_read_bytes(p_colr_header_data,&jp2->enumcs ,4);                     /* EnumCS */
         
-                p_colr_header_data += 4;
-
-                if(jp2->enumcs == 14)/* CIELab */
-                {
-                        OPJ_UINT32 *cielab;
-                        OPJ_UINT32 rl, ol, ra, oa, rb, ob, il;
-
-                        cielab = (OPJ_UINT32*)opj_malloc(9 * sizeof(OPJ_UINT32));
-                        cielab[0] = 14; /* enumcs */
-
-                        if(p_colr_header_size == 7)/* default values */
-                        {
-                                rl = ra = rb = ol = oa = ob = 0;
-                                il = 0x00443530; /* D50 */
-                                cielab[1] = 0x44454600;/* DEF */
-                        }
-                        else if(p_colr_header_size == 35)
-                        {
-                                opj_read_bytes(p_colr_header_data, &rl, 4);
-                                p_colr_header_data += 4;
-                                opj_read_bytes(p_colr_header_data, &ol, 4);
-                                p_colr_header_data += 4;
-                                opj_read_bytes(p_colr_header_data, &ra, 4);
-                                p_colr_header_data += 4;
-                                opj_read_bytes(p_colr_header_data, &oa, 4);
-                                p_colr_header_data += 4;
-                                opj_read_bytes(p_colr_header_data, &rb, 4);
-                                p_colr_header_data += 4;
-                                opj_read_bytes(p_colr_header_data, &ob, 4);
-                                p_colr_header_data += 4;
-                                opj_read_bytes(p_colr_header_data, &il, 4);
-                                p_colr_header_data += 4;
-                                cielab[1] = 0;
-                        }
-                        cielab[2] = rl; cielab[4] = ra; cielab[6] = rb;
-                        cielab[3] = ol; cielab[5] = oa; cielab[7] = ob;
-                        cielab[8] = il;
-
-                        jp2->color.icc_profile_buf = (unsigned char*)cielab;
-                        jp2->color.icc_profile_len = 0;
-                }
-
         jp2->color.jp2_has_colr = 1;
         }
         else if (jp2->meth == 2) {
                 /* ICC profile */
                 OPJ_INT32 it_icc_value = 0;
                 OPJ_INT32 icc_len = (OPJ_INT32)p_colr_header_size - 3;
 
                 jp2->color.icc_profile_len = (OPJ_UINT32)icc_len;
-                jp2->color.icc_profile_buf = (OPJ_BYTE*) opj_malloc((size_t)icc_len);
+                jp2->color.icc_profile_buf = (OPJ_BYTE*) opj_calloc(1,(size_t)icc_len);
         if (!jp2->color.icc_profile_buf)
         {
             jp2->color.icc_profile_len = 0;
             return OPJ_FALSE;
         }
-                memset(jp2->color.icc_profile_buf, 0, (size_t)icc_len * sizeof(OPJ_BYTE));
 
                 for (it_icc_value = 0; it_icc_value < icc_len; ++it_icc_value)
                 {
                         opj_read_bytes(p_colr_header_data,&l_value,1);          /* icc values */
                         ++p_colr_header_data;
                         jp2->color.icc_profile_buf[it_icc_value] = (OPJ_BYTE) l_value;
                 }
             
         jp2->color.jp2_has_colr = 1;
         }
         else if (jp2->meth > 2)
     {
-        /*      ISO/IEC 15444-1:2004 (E), Table I.9 ?Legal METH values:
+        /*      ISO/IEC 15444-1:2004 (E), Table I.9 ­ Legal METH values:
         conforming JP2 reader shall ignore the entire Colour Specification box.*/
         opj_event_msg(p_manager, EVT_INFO, "COLR BOX meth value is not a regular value (%d), " 
             "so we will ignore the entire Colour Specification box. \n", jp2->meth);
     }
     return OPJ_TRUE;
 }
 
 OPJ_BOOL opj_jp2_decode(opj_jp2_t *jp2,
                         opj_stream_private_t *p_stream,
                         opj_image_t* p_image,
@@ skipping 28 matching lines @@
             /* Apply the color space if needed */
             if(jp2->color.jp2_cdef) {
                     opj_jp2_apply_cdef(p_image, &(jp2->color));
             }
 
             if(jp2->color.jp2_pclr) {
                     /* Part 1, I.5.3.4: Either both or none : */
                     if( !jp2->color.jp2_pclr->cmap)
                             opj_jp2_free_pclr(&(jp2->color));
                     else
-                                if(!p_image->useColorSpace)
                             opj_jp2_apply_pclr(p_image, &(jp2->color));
             }
 
             if(jp2->color.icc_profile_buf) {
                     p_image->icc_profile_buf = jp2->color.icc_profile_buf;
                     p_image->icc_profile_len = jp2->color.icc_profile_len;
                     jp2->color.icc_profile_buf = NULL;
             }
     }
 
@@ skipping 105 matching lines @@
         OPJ_UINT32 i;
         OPJ_UINT32 l_ftyp_size = 16 + 4 * jp2->numcl;
         OPJ_BYTE * l_ftyp_data, * l_current_data_ptr;
         OPJ_BOOL l_result;
 
         /* preconditions */
         assert(cio != 00);
         assert(jp2 != 00);
         assert(p_manager != 00);
 
-        l_ftyp_data = (OPJ_BYTE *) opj_malloc(l_ftyp_size);
+        l_ftyp_data = (OPJ_BYTE *) opj_calloc(1,l_ftyp_size);
         
         if (l_ftyp_data == 00) {
                 opj_event_msg(p_manager, EVT_ERROR, "Not enough memory to handle ftyp data\n");
                 return OPJ_FALSE;
         }
 
-        memset(l_ftyp_data,0,l_ftyp_size);
-
         l_current_data_ptr = l_ftyp_data;
 
         opj_write_bytes(l_current_data_ptr, l_ftyp_size,4); /* box size */
         l_current_data_ptr += 4;
 
         opj_write_bytes(l_current_data_ptr, JP2_FTYP,4); /* FTYP */
         l_current_data_ptr += 4;
 
         opj_write_bytes(l_current_data_ptr, jp2->brand,4); /* BR */
         l_current_data_ptr += 4;
@@ skipping 90 matching lines @@
 
         /* further JP2 initializations go here */
         jp2->color.jp2_has_colr = 0;
     jp2->ignore_pclr_cmap_cdef = parameters->flags & OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG;
 }
 
 /* ----------------------------------------------------------------------- */
 /* JP2 encoder interface                                             */
 /* ----------------------------------------------------------------------- */
 
-void opj_jp2_setup_encoder(     opj_jp2_t *jp2,
+OPJ_BOOL opj_jp2_setup_encoder( opj_jp2_t *jp2,
                             opj_cparameters_t *parameters,
                             opj_image_t *image,
                             opj_event_mgr_t * p_manager)
 {
     OPJ_UINT32 i;
         OPJ_UINT32 depth_0;
   OPJ_UINT32 sign;
 
         if(!jp2 || !parameters || !image)
-                return;
+                return OPJ_FALSE;
 
         /* setup the J2K codec */
         /* ------------------- */
 
         /* Check if number of components respects standard */
         if (image->numcomps < 1 || image->numcomps > 16384) {
                 opj_event_msg(p_manager, EVT_ERROR, "Invalid number of components specified while setting up JP2 encoder\n");
-                return;
+                return OPJ_FALSE;
         }
 
-        opj_j2k_setup_encoder(jp2->j2k, parameters, image, p_manager );
+        if (opj_j2k_setup_encoder(jp2->j2k, parameters, image, p_manager ) == OPJ_FALSE) {
+                return OPJ_FALSE;
+        }
 
         /* setup the JP2 codec */
         /* ------------------- */
         
         /* Profile box */
 
         jp2->brand = JP2_JP2;   /* BR */
         jp2->minversion = 0;    /* MinV */
         jp2->numcl = 1;
         jp2->cl = (OPJ_UINT32*) opj_malloc(jp2->numcl * sizeof(OPJ_UINT32));
-    if (!jp2->cl){
-        jp2->cl = NULL;
-        opj_event_msg(p_manager, EVT_ERROR, "Not enough memory when setup the JP2 encoder\n");
-        return;
-    }
+        if (!jp2->cl){
+                jp2->cl = NULL;
+                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");
-        return;
-    }
+        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;
         jp2->bpc = depth_0 + (sign << 7);
         for (i = 1; i < image->numcomps; i++) {
                 OPJ_UINT32 depth = image->comps[i].prec - 1;
                 sign = image->comps[i].sgnd;
@@ skipping 22 matching lines @@
             jp2->enumcs = 17;   /* greyscale */
         else if (image->color_space == 3)
             jp2->enumcs = 18;   /* YUV */
     }
 
 
         jp2->precedence = 0;    /* PRECEDENCE */
         jp2->approx = 0;                /* APPROX */
 
         jp2->jpip_on = parameters->jpip_on;
+
+        return OPJ_TRUE;
 }
 
 OPJ_BOOL opj_jp2_encode(opj_jp2_t *jp2,
                                                 opj_stream_private_t *stream,
                                                 opj_event_mgr_t * p_manager)
 {
         return opj_j2k_encode(jp2->j2k, stream, p_manager);
 }
 
 OPJ_BOOL opj_jp2_end_decompress(opj_jp2_t *jp2,
@@ skipping 130 matching lines @@
         const opj_jp2_header_handler_t * l_current_handler;
         OPJ_UINT32 l_last_data_size = OPJ_BOX_SIZE;
         OPJ_UINT32 l_current_data_size;
         OPJ_BYTE * l_current_data = 00;
 
         /* preconditions */
         assert(stream != 00);
         assert(jp2 != 00);
         assert(p_manager != 00);
 
-        l_current_data = (OPJ_BYTE*)opj_malloc(l_last_data_size);
+        l_current_data = (OPJ_BYTE*)opj_calloc(1,l_last_data_size);
 
         if (l_current_data == 00) {
                 opj_event_msg(p_manager, EVT_ERROR, "Not enough memory to handle jpeg2000 file header\n");
                 return OPJ_FALSE;
         }
-        memset(l_current_data, 0 , l_last_data_size);
 
         while (opj_jp2_read_boxhdr(&box,&l_nb_bytes_read,stream,p_manager)) {
                 /* is it the codestream box ? */
                 if (box.type == JP2_JP2C) {
                         if (jp2->jp2_state & JP2_STATE_HEADER) {
                                 jp2->jp2_state |= JP2_STATE_CODESTREAM;
                                 opj_free(l_current_data);
                                 return OPJ_TRUE;
                         }
                         else {
                                 opj_event_msg(p_manager, EVT_ERROR, "bad placed jpeg codestream\n");
                                 opj_free(l_current_data);
                                 return OPJ_FALSE;
                         }
                 }
                 else if (box.length == 0) {
                         opj_event_msg(p_manager, EVT_ERROR, "Cannot handle box of undefined sizes\n");
                         opj_free(l_current_data);
                         return OPJ_FALSE;
                 }
                 /* testcase 1851.pdf.SIGSEGV.ce9.948 */
-                /* testcase K-5787457125613568 */
-                else if (box.length < l_nb_bytes_read || box.length > opj_stream_get_number_byte_left(stream)) {
+                else if (box.length < l_nb_bytes_read) {
                         opj_event_msg(p_manager, EVT_ERROR, "invalid box size %d (%x)\n", box.length, box.type);
                         opj_free(l_current_data);
                         return OPJ_FALSE;
                 }
 
                 l_current_handler = opj_jp2_find_handler(box.type);
                 l_current_data_size = box.length - l_nb_bytes_read;
 
                 if (l_current_handler != 00) {
                         if (l_current_data_size > l_last_data_size) {
@@ skipping 227 matching lines @@
 
         /* the number of remaining bytes should be a multiple of 4 */
         if ((l_remaining_bytes & 0x3) != 0) {
                 opj_event_msg(p_manager, EVT_ERROR, "Error with FTYP signature Box size\n");
                 return OPJ_FALSE;
         }
 
         /* div by 4 */
         jp2->numcl = l_remaining_bytes >> 2;
         if (jp2->numcl) {
-                jp2->cl = (OPJ_UINT32 *) opj_malloc(jp2->numcl * sizeof(OPJ_UINT32));
+                jp2->cl = (OPJ_UINT32 *) opj_calloc(jp2->numcl, sizeof(OPJ_UINT32));
                 if (jp2->cl == 00) {
                         opj_event_msg(p_manager, EVT_ERROR, "Not enough memory with FTYP Box\n");
                         return OPJ_FALSE;
                 }
-                memset(jp2->cl,0,jp2->numcl * sizeof(OPJ_UINT32));
         }
 
         for (i = 0; i < jp2->numcl; ++i)
         {
                 opj_read_bytes(p_header_data,&jp2->cl[i],4);            /* CLi */
                 p_header_data += 4;
         }
 
         jp2->jp2_state |= JP2_STATE_FILE_TYPE;
 
@@ skipping 76 matching lines @@
                         opj_event_msg(p_manager, EVT_ERROR, "Stream error while reading JP2 Header box\n");
                         return OPJ_FALSE;
                 }
 
                 if (box.length > p_header_size) {
                         opj_event_msg(p_manager, EVT_ERROR, "Stream error while reading JP2 Header box: box length is inconsistent.\n");
                         return OPJ_FALSE;
                 }
 
                 l_current_handler = opj_jp2_img_find_handler(box.type);
-                //BUGID:0055999
-                //test file: fuzz-signal_sigsegv_6b88de_1123_2509.pdf
-                if (box.length < l_box_size) return OPJ_FALSE;
                 l_current_data_size = box.length - l_box_size;
                 p_header_data += l_box_size;
 
                 if (l_current_handler != 00) {
                         if (! l_current_handler->handler(jp2,p_header_data,l_current_data_size,p_manager)) {
                                 return OPJ_FALSE;
                         }
                 }
                 else {
                         jp2->jp2_img_state |= JP2_IMG_STATE_UNKNOWN;
@@ skipping 326 matching lines @@
 
         return OPJ_TRUE;
 }
 
 /* ----------------------------------------------------------------------- */
 /* JP2 encoder interface                                             */
 /* ----------------------------------------------------------------------- */
 
 opj_jp2_t* opj_jp2_create(OPJ_BOOL p_is_decoder)
 {
-        opj_jp2_t *jp2 = (opj_jp2_t*)opj_malloc(sizeof(opj_jp2_t));
+        opj_jp2_t *jp2 = (opj_jp2_t*)opj_calloc(1,sizeof(opj_jp2_t));
         if (jp2) {
-                memset(jp2,0,sizeof(opj_jp2_t));
 
                 /* create the J2K codec */
                 if (! p_is_decoder) {
                         jp2->j2k = opj_j2k_create_compress();
                 }
                 else {
                         jp2->j2k = opj_j2k_create_decompress();
                 }
 
                 if (jp2->j2k == 00) {
@@ skipping 226 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 */