Replace an assertion with returning false

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 878 matching lines @@
                         }
                 }
 
                 pcol_usage = opj_calloc(nr_channels, sizeof(OPJ_BOOL));
                 if (!pcol_usage) {
                         opj_event_msg(p_manager, EVT_ERROR, "Unexpected OOM.\n");
                         return OPJ_FALSE;
                 }
                 /* verify that no component is targeted more than once */
                 for (i = 0; i < nr_channels; i++) {
-      OPJ_UINT16 pcol = cmap[i].pcol;
-      assert(cmap[i].mtyp == 0 || cmap[i].mtyp == 1);
+                        if (cmap[i].mtyp != 0 && cmap[i].mtyp != 1) {
+                                opj_event_msg(p_manager, EVT_ERROR, "Unexpected MTYP value.\n");
+                                opj_free(pcol_usage);
+                                return OPJ_FALSE;
+                        }
+                        OPJ_UINT16 pcol = cmap[i].pcol;
                         if (pcol >= nr_channels) {
                                 opj_event_msg(p_manager, EVT_ERROR, "Invalid component/palette index for direct mapping %d.\n", pcol);
                                 is_sane = OPJ_FALSE;
                         }
                         else if (pcol_usage[pcol] && cmap[i].mtyp != 0) {
                                 opj_event_msg(p_manager, EVT_ERROR, "Component %d is mapped twice.\n", pcol);
                                 is_sane = OPJ_FALSE;
                         }
       else if (cmap[i].mtyp == 0 && cmap[i].pcol != 0) {
         /* I.5.3.5 PCOL: If the value of the MTYP field for this channel is 0, then
@@ skipping 2238 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 */