Fix potential out-of-bounds read (coverity) (#844)

[openjpeg.git] / src / lib / openmj2 / mj2.c

diff --git a/src/lib/openmj2/mj2.c b/src/lib/openmj2/mj2.c
index f5ab5f3f4e04216f045f2a5c93d8dc80c54378c8..b9034a301c8fa8accc4a7a681c6f4740d8a16b8d 100644 (file)
--- a/src/lib/openmj2/mj2.c
+++ b/src/lib/openmj2/mj2.c
@@ -1,6 +1,11 @@
 /*
- * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2007, Professor Benoit Macq
+ * 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) 2003-2007, Francois-Olivier Devaux 
  * All rights reserved.
  *
@@ -78,7 +83,7 @@ int mj2_read_boxhdr(mj2_box_t * box, opj_cio_t *cio)
 *
 */
 
-int mj2_init_stdmovie(opj_mj2_t * movie)
+int OPJ_CALLCONV mj2_init_stdmovie(opj_mj2_t * movie)
 {
   mj2_tk_t *tk0;
   int i, w, h, prec;
@@ -300,7 +305,7 @@ void mj2_stco_decompact(mj2_tk_t * tk)
 * JP Signature box
 *
 */
-void mj2_write_jp(opj_cio_t *cio)
+void OPJ_CALLCONV mj2_write_jp(opj_cio_t *cio)
 {
   mj2_box_t box;
   box.init_pos = cio_tell(cio);
@@ -348,7 +353,7 @@ int mj2_read_jp(opj_cio_t *cio)
 * File type box
 *
 */
-void mj2_write_ftyp(opj_mj2_t * movie, opj_cio_t *cio)
+void OPJ_CALLCONV mj2_write_ftyp(opj_mj2_t * movie, opj_cio_t *cio)
 {
   int i;
   mj2_box_t box;
@@ -2536,7 +2541,7 @@ int mj2_read_mvhd(opj_mj2_t * movie, opj_cio_t *cio)
 * Movie Box
 *
 */
-void mj2_write_moov(opj_mj2_t * movie, opj_cio_t *cio)
+void OPJ_CALLCONV mj2_write_moov(opj_mj2_t * movie, opj_cio_t *cio)
 {
   int i;
   mj2_box_t box;
@@ -2608,7 +2613,7 @@ int mj2_read_moov(opj_mj2_t * movie, opj_image_t * img, opj_cio_t *cio)
   return 0;
 }
 
-int mj2_read_struct(FILE *file, opj_mj2_t *movie) {
+int OPJ_CALLCONV mj2_read_struct(FILE *file, opj_mj2_t *movie) {
   mj2_box_t box;
   opj_image_t img;
   unsigned char * src;
@@ -2721,7 +2726,7 @@ int mj2_read_struct(FILE *file, opj_mj2_t *movie) {
 /* MJ2 decoder interface                                                                                                                                            */
 /* ----------------------------------------------------------------------- */
 
-opj_dinfo_t* mj2_create_decompress() {
+opj_dinfo_t* OPJ_CALLCONV mj2_create_decompress() {
        opj_mj2_t* mj2;
        opj_dinfo_t *dinfo = (opj_dinfo_t*) opj_calloc(1, sizeof(opj_dinfo_t));
        if(!dinfo) return NULL;
@@ -2739,7 +2744,7 @@ opj_dinfo_t* mj2_create_decompress() {
        return dinfo;
 }
 
-void mj2_setup_decoder(opj_mj2_t *movie, mj2_dparameters_t *mj2_parameters) {
+void OPJ_CALLCONV mj2_setup_decoder(opj_mj2_t *movie, mj2_dparameters_t *mj2_parameters) {
        movie->num_vtk=0;
   movie->num_stk=0;
   movie->num_htk=0;    
@@ -2750,7 +2755,7 @@ void mj2_setup_decoder(opj_mj2_t *movie, mj2_dparameters_t *mj2_parameters) {
 
 }
 
-void mj2_destroy_decompress(opj_mj2_t *movie) {
+void OPJ_CALLCONV mj2_destroy_decompress(opj_mj2_t *movie) {
        if(movie) {
                int i;
                mj2_tk_t *tk=NULL;
@@ -2799,8 +2804,7 @@ void mj2_destroy_decompress(opj_mj2_t *movie) {
 /* MJ2 encoder interface                                                                                                                                            */
 /* ----------------------------------------------------------------------- */
 
-
-opj_cinfo_t* mj2_create_compress() {
+opj_cinfo_t* OPJ_CALLCONV mj2_create_compress() {
        opj_mj2_t* mj2;
        opj_cinfo_t *cinfo = (opj_cinfo_t*) opj_calloc(1, sizeof(opj_cinfo_t));
        if(!cinfo) return NULL;
@@ -2817,7 +2821,7 @@ opj_cinfo_t* mj2_create_compress() {
        return cinfo;
 }
 
-void mj2_setup_encoder(opj_mj2_t *movie, mj2_cparameters_t *parameters) {
+void OPJ_CALLCONV mj2_setup_encoder(opj_mj2_t *movie, mj2_cparameters_t *parameters) {
        if(movie && parameters) {
                opj_jp2_t *jp2_struct;
                        
@@ -2868,7 +2872,7 @@ void mj2_setup_encoder(opj_mj2_t *movie, mj2_cparameters_t *parameters) {
   }
 }
 
-void mj2_destroy_compress(opj_mj2_t *movie) {
+void OPJ_CALLCONV mj2_destroy_compress(opj_mj2_t *movie) {
        if(movie) {
                int i;
                mj2_tk_t *tk=NULL;
@@ -2913,3 +2917,8 @@ void mj2_destroy_compress(opj_mj2_t *movie) {
        }       
        opj_free(movie);
 }
+
+/*@}*/
+
+/*@}*/
+