jp3d/jpwl/mj2/jpip: Fix resource leaks (#1226)

This issues were found by cppcheck and coverity.

8 files changed, 26 insertions, 0 deletions

diff --git a/src/lib/openjp3d/t2.c b/src/lib/openjp3d/t2.c
index a31bf83f..9856d1d9 100644
--- a/src/lib/openjp3d/t2.c
+++ b/src/lib/openjp3d/t2.c
@@ -268,6 +268,7 @@ static int t2_encode_packet(opj_tcd_tile_t * tile, opj_tcp_t * tcp,
 
 
     if (bio_flush(bio)) {
+        bio_destroy(bio);
         return -999;        /* modified to eliminate longjmp !! */
     }
 
diff --git a/src/lib/openjpip/auxtrans_manager.c b/src/lib/openjpip/auxtrans_manager.c
index eba9870f..8f364b6d 100644
--- a/src/lib/openjpip/auxtrans_manager.c
+++ b/src/lib/openjpip/auxtrans_manager.c
@@ -232,6 +232,9 @@ void * aux_streaming(void *arg)
             }
             break;
         }
+        if (close_socket(connected_socket) != 0) {
+            perror("close");
+        }
     }
     opj_free(chunk);
 
diff --git a/src/lib/openjpip/box_manager.c b/src/lib/openjpip/box_manager.c
index ce520640..eb6b9d4c 100644
--- a/src/lib/openjpip/box_manager.c
+++ b/src/lib/openjpip/box_manager.c
@@ -211,6 +211,7 @@ box_param_t * gene_boxbyType(int fd, OPJ_OFF_T offset, OPJ_SIZE_T length,
                 } else {
                     fprintf(FCGI_stderr, "Error: error in gene_boxbyType( %d, %" PRId64 ", %" PRId64
                             ", %s)\n", fd, offset, length, TBox);
+                    free(data);
                     return NULL;
                 }
             }
diff --git a/src/lib/openjpip/index_manager.c b/src/lib/openjpip/index_manager.c
index 2d7d683b..89753752 100644
--- a/src/lib/openjpip/index_manager.c
+++ b/src/lib/openjpip/index_manager.c
@@ -270,6 +270,7 @@ OPJ_BOOL check_JP2boxidx(boxlist_param_t *toplev_boxlist)
     ni = fetch_DBox1byte(prxy, pos);
     if (ni != 1) {
         fprintf(FCGI_stderr, "Multiple indexes not supported\n");
+        opj_free(prxy);
         return OPJ_FALSE;
     }
     pos += 1;
@@ -361,6 +362,7 @@ OPJ_BOOL set_cidxdata(box_param_t *cidx_box, index_param_t *jp2idx)
     if (!search_boxheader("mhix", manf)) {
         fprintf(FCGI_stderr, "Error: mhix box not present in manfbox\n");
         opj_free(jp2idx);
+        delete_manfbox(&manf);
         return OPJ_FALSE;
     }
     set_mainmhixdata(cidx_box, codestream, jp2idx);
@@ -368,6 +370,7 @@ OPJ_BOOL set_cidxdata(box_param_t *cidx_box, index_param_t *jp2idx)
     if (!search_boxheader("tpix", manf)) {
         fprintf(FCGI_stderr, "Error: tpix box not present in manfbox\n");
         opj_free(jp2idx);
+        delete_manfbox(&manf);
         return OPJ_FALSE;
     }
     set_tpixdata(cidx_box, jp2idx);
@@ -375,6 +378,7 @@ OPJ_BOOL set_cidxdata(box_param_t *cidx_box, index_param_t *jp2idx)
     if (!search_boxheader("thix", manf)) {
         fprintf(FCGI_stderr, "Error: thix box not present in manfbox\n");
         opj_free(jp2idx);
+        delete_manfbox(&manf);
         return OPJ_FALSE;
     }
     set_thixdata(cidx_box, jp2idx);
@@ -382,6 +386,7 @@ OPJ_BOOL set_cidxdata(box_param_t *cidx_box, index_param_t *jp2idx)
     if (!search_boxheader("ppix", manf)) {
         fprintf(FCGI_stderr, "Error: ppix box not present in manfbox\n");
         opj_free(jp2idx);
+        delete_manfbox(&manf);
         return OPJ_FALSE;
     }
     set_ppixdata(cidx_box, jp2idx);
@@ -497,6 +502,7 @@ OPJ_BOOL set_tpixdata(box_param_t *cidx_box, index_param_t *jp2idx)
     if (!(faix_box = gene_boxbyType(tpix_box->fd, get_DBoxoff(tpix_box),
                                     get_DBoxlen(tpix_box), "faix"))) {
         fprintf(FCGI_stderr, "Error: faix box not present in tpix box\n");
+        opj_free(tpix_box);
         return OPJ_FALSE;
     }
 
@@ -602,11 +608,13 @@ OPJ_BOOL set_ppixdata(box_param_t *cidx_box, index_param_t *jp2idx)
         if (jp2idx->SIZ.Csiz <= comp_idx) {
             fprintf(FCGI_stderr,
                     "Error: num of faix boxes is not identical to num of components in ppix box\n");
+            delete_manfbox(&manf);
             return OPJ_FALSE;
         }
 
         if (!(faix_box = gene_boxbyOffset(cidx_box->fd, inbox_offset))) {
             fprintf(FCGI_stderr, "Error: faix box not present in ppix box\n");
+            delete_manfbox(&manf);
             return OPJ_FALSE;
         }
 
diff --git a/src/lib/openjpip/jp2k_decoder.c b/src/lib/openjpip/jp2k_decoder.c
index e6d1973b..bb3f5eca 100644
--- a/src/lib/openjpip/jp2k_decoder.c
+++ b/src/lib/openjpip/jp2k_decoder.c
@@ -76,6 +76,8 @@ Byte_t * j2k_to_pnm(const char *fn, ihdrbox_param_t **ihdrbox)
     /* setup the decoder decoding parameters using user parameters */
     if (!opj_setup_decoder(l_codec, &parameters)) {
         fprintf(stderr, "ERROR -> j2k_dump: failed to setup the decoder\n");
+        opj_stream_destroy(l_stream);
+        opj_destroy_codec(l_codec);
         return NULL;
     }
 
diff --git a/src/lib/openjpip/openjpip.c b/src/lib/openjpip/openjpip.c
index 7fa53136..f9eb04fd 100644
--- a/src/lib/openjpip/openjpip.c
+++ b/src/lib/openjpip/openjpip.c
@@ -357,6 +357,7 @@ OPJ_BOOL OPJ_CALLCONV fread_jpip(const char fname[], jpip_dec_param_t *dec)
     }
 
     if (!(dec->jpiplen = (Byte8_t)get_filesize(infd))) {
+        close(infd);
         return OPJ_FALSE;
     }
 
@@ -365,6 +366,7 @@ OPJ_BOOL OPJ_CALLCONV fread_jpip(const char fname[], jpip_dec_param_t *dec)
     if (read(infd, dec->jpipstream, dec->jpiplen) != (int)dec->jpiplen) {
         fprintf(stderr, "file reading error\n");
         opj_free(dec->jpipstream);
+        close(infd);
         return OPJ_FALSE;
     }
 
diff --git a/src/lib/openmj2/mj2.c b/src/lib/openmj2/mj2.c
index 8e036f18..3cbf83f5 100644
--- a/src/lib/openmj2/mj2.c
+++ b/src/lib/openmj2/mj2.c
@@ -2822,16 +2822,24 @@ int OPJ_CALLCONV mj2_read_struct(FILE *file, opj_mj2_t *movie)
 
     fseek(file, foffset, SEEK_SET);
     src = (unsigned char*)opj_realloc(src, box.length);
+    if (src == NULL) {
+        opj_event_msg(cio->cinfo, EVT_ERROR, "Error reallocation memory\n");
+        opj_free(src);
+        return 1;
+    }
+
     fsresult = fread(src, box.length, 1, file);
     if (fsresult != 1) {
         opj_event_msg(cio->cinfo, EVT_ERROR,
                       "End of file reached while trying to read MOOV box\n");
+        opj_free(src);
         return 1;
     }
 
     cio = opj_cio_open((opj_common_ptr)movie->cinfo, src, box.length);
 
     if (mj2_read_moov(movie, &img, cio)) {
+        opj_free(src);
         return 1;
     }
 
diff --git a/src/lib/openmj2/mj2_convert.c b/src/lib/openmj2/mj2_convert.c
index 65aa3bc6..0d7816b8 100644
--- a/src/lib/openmj2/mj2_convert.c
+++ b/src/lib/openmj2/mj2_convert.c
@@ -62,6 +62,7 @@ unsigned int OPJ_CALLCONV yuv_num_frames(mj2_tk_t * tk, char *infile)
         fprintf(stderr,
                 "YUV does not contains any frame of %d x %d size\n", tk->w,
                 tk->h);
+        fclose(f);
         return 0;
     }
     fclose(f);