Upgrade openjpeg to revision 2997.

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 688 matching lines @@
         OPJ_UINT32 l_value;
         OPJ_UINT16 i;
 
         /* preconditions */
         assert(jp2 != 00);
         assert(p_nb_bytes_written != 00);
         assert(jp2->color.jp2_cdef != 00);
         assert(jp2->color.jp2_cdef->info != 00);
         assert(jp2->color.jp2_cdef->n > 0U);
 
-        l_cdef_size += 6 * jp2->color.jp2_cdef->n;
+        l_cdef_size += 6U * jp2->color.jp2_cdef->n;
 
         l_cdef_data = (OPJ_BYTE *) opj_malloc(l_cdef_size);
         if (l_cdef_data == 00) {
                 return 00;
         }
 
         l_current_cdef_ptr = l_cdef_data;
-
+        
         opj_write_bytes(l_current_cdef_ptr,l_cdef_size,4);                      /* write box size */
         l_current_cdef_ptr += 4;
 
         opj_write_bytes(l_current_cdef_ptr,JP2_CDEF,4);                                 /* BPCC */
         l_current_cdef_ptr += 4;
 
         l_value = jp2->color.jp2_cdef->n;
         opj_write_bytes(l_current_cdef_ptr,l_value,2);                                  /* N */
         l_current_cdef_ptr += 2;
 
@@ skipping 449 matching lines @@
 
         jp2->color.jp2_pclr->cmap = cmap;
 
         return OPJ_TRUE;
 }
 
 void opj_jp2_apply_cdef(opj_image_t *image, opj_jp2_color_t *color)
 {
         opj_jp2_cdef_info_t *info;
         OPJ_UINT16 i, n, cn, asoc, acn;
-
+        
         info = color->jp2_cdef->info;
         n = color->jp2_cdef->n;
-
+        
         for(i = 0; i < n; ++i)
         {
                 /* WATCH: acn = asoc - 1 ! */
                 asoc = info[i].asoc;
                 cn = info[i].cn;
-
+                
                 if( cn >= image->numcomps)
                 {
                         fprintf(stderr, "cn=%d, numcomps=%d\n", cn, image->numcomps);
                         continue;
                 }
                 if(asoc == 0 || asoc == 65535)
                 {
                         image->comps[cn].alpha = info[i].typ;
                         continue;
                 }
-
+                
                 acn = (OPJ_UINT16)(asoc - 1);
                 if( acn >= image->numcomps )
                 {
                         fprintf(stderr, "acn=%d, numcomps=%d\n", acn, image->numcomps);
                         continue;
                 }
-
+                
                 /* Swap only if color channel */
                 if((cn != acn) && (info[i].typ == 0))
                 {
                         opj_image_comp_t saved;
                         OPJ_UINT16 j;
-
+                        
                         memcpy(&saved, &image->comps[cn], sizeof(opj_image_comp_t));
                         memcpy(&image->comps[cn], &image->comps[acn], sizeof(opj_image_comp_t));
                         memcpy(&image->comps[acn], &saved, sizeof(opj_image_comp_t));
-
+                        
                         /* Swap channels in following channel definitions, don't bother with j <= i that are already processed */
-                        for (j = i + 1; j < n ; ++j)
+                        for (j = (OPJ_UINT16)(i + 1U); j < n ; ++j)
                         {
                                 if (info[j].cn == cn) {
                                         info[j].cn = acn;
                                 }
                                 else if (info[j].cn == acn) {
                                         info[j].cn = cn;
                                 }
                                 /* asoc is related to color index. Do not update. */
                         }
                 }
-
+                
                 image->comps[cn].alpha = info[i].typ;
         }
-
+        
         if(color->jp2_cdef->info) opj_free(color->jp2_cdef->info);
-
+        
         opj_free(color->jp2_cdef); color->jp2_cdef = NULL;
-
+        
 }/* jp2_apply_cdef() */
 
 OPJ_BOOL opj_jp2_read_cdef(     opj_jp2_t * jp2,
                             OPJ_BYTE * p_cdef_header_data,
                                                         OPJ_UINT32 p_cdef_header_size,
                                                         opj_event_mgr_t * p_manager
                             )
 {
         opj_jp2_cdef_info_t *cdef_info;
         OPJ_UINT16 i;
@@ skipping 225 matching lines @@
         else {
                 l_nb_pass = 2;
                 l_writers[0].handler = opj_jp2_write_ihdr;
                 l_writers[1].handler = opj_jp2_write_colr;
         }
         
         if (jp2->color.jp2_cdef != NULL) {
                 l_writers[l_nb_pass].handler = opj_jp2_write_cdef;
                 l_nb_pass++;
         }
-
+        
         /* write box header */
         /* write JP2H type */
         opj_write_bytes(l_jp2h_data+4,JP2_JP2H,4);
 
         l_current_writer = l_writers;
         for (i=0;i<l_nb_pass;++i) {
                 l_current_writer->m_data = l_current_writer->handler(jp2,&(l_current_writer->m_size));
                 if (l_current_writer->m_data == 00) {
                         opj_event_msg(p_manager, EVT_ERROR, "Not enough memory to hold JP2 Header data\n");
                         l_result = OPJ_FALSE;
@@ skipping 185 matching lines @@
                             opj_cparameters_t *parameters,
                             opj_image_t *image,
                             opj_event_mgr_t * p_manager)
 {
         OPJ_UINT32 i;
         OPJ_UINT32 depth_0;
   OPJ_UINT32 sign;
         OPJ_UINT32 alpha_count;
         OPJ_UINT32 color_channels = 0U;
         OPJ_UINT32 alpha_channel = 0U;
-
+        
 
         if(!jp2 || !parameters || !image)
                 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");
@@ skipping 255 matching lines @@
 
         /* PARAMETER VALIDATION */
         /* number of components */
         l_is_valid &= (jp2->numcl > 0);
         /* width */
         l_is_valid &= (jp2->h > 0);
         /* height */
         l_is_valid &= (jp2->w > 0);
         /* precision */
         for (i = 0; i < jp2->numcomps; ++i)     {
-                l_is_valid &= (jp2->comps[i].bpcc > 0);
+                l_is_valid &= ((jp2->comps[i].bpcc & 0x7FU) < 38U); /* 0 is valid, ignore sign for check */
         }
 
         /* METH */
         l_is_valid &= ((jp2->meth > 0) && (jp2->meth < 3));
 
         /* stream validation */
         /* back and forth is needed */
         l_is_valid &= opj_stream_has_seek(cio);
 
         return l_is_valid;
@@ skipping 76 matching lines @@
                 opj_free(l_current_data);                
                                 return OPJ_FALSE;
                         }
 
                         if (! l_current_handler->handler(jp2,l_current_data,l_current_data_size,p_manager)) {
                                 opj_free(l_current_data);
                                 return OPJ_FALSE;
                         }
                 }
                 else {
+            if (!(jp2->jp2_state & JP2_STATE_SIGNATURE)) {
+                opj_event_msg(p_manager, EVT_ERROR, "Malformed JP2 file format: first box must be JPEG 2000 signature box\n");
+                opj_free(l_current_data);
+                return OPJ_FALSE;
+            }
+            if (!(jp2->jp2_state & JP2_STATE_FILE_TYPE)) {
+                opj_event_msg(p_manager, EVT_ERROR, "Malformed JP2 file format: second box must be file type box\n");
+                opj_free(l_current_data);
+                return OPJ_FALSE;
+            }
                         jp2->jp2_state |= JP2_STATE_UNKNOWN;
                         if (opj_stream_skip(stream,l_current_data_size,p_manager) != l_current_data_size) {
                                 opj_event_msg(p_manager, EVT_ERROR, "Problem with skipping JPEG2000 box, stream error\n");
                                 opj_free(l_current_data);
                                 return OPJ_FALSE;
                         }
                 }
         }
 
         opj_free(l_current_data);
@@ skipping 633 matching lines @@
         else
                 p_image->color_space = OPJ_CLRSPC_UNKNOWN;
 
         if(p_jp2->color.jp2_pclr) {
                 /* Part 1, I.5.3.4: Either both or none : */
                 if( !p_jp2->color.jp2_pclr->cmap)
                         opj_jp2_free_pclr(&(p_jp2->color));
                 else
                         opj_jp2_apply_pclr(p_image, &(p_jp2->color));
         }
-
+        
         /* Apply the color space if needed */
         if(p_jp2->color.jp2_cdef) {
                 opj_jp2_apply_cdef(p_image, &(p_jp2->color));
         }
 
         if(p_jp2->color.icc_profile_buf) {
                 p_image->icc_profile_buf = p_jp2->color.icc_profile_buf;
                 p_image->icc_profile_len = p_jp2->color.icc_profile_len;
                 p_jp2->color.icc_profile_buf = NULL;
         }
@@ skipping 248 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 */