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

This issues were found by cppcheck and coverity.

diff --git a/src/bin/jp3d/convert.c b/src/bin/jp3d/convert.c
index acad8f82a84fc4f64d2beef67a4ddb9c8122ed29..4e4bea9ce7f057304d1bf40a9f4db5161587a1f4 100644 (file)
--- a/src/bin/jp3d/convert.c
+++ b/src/bin/jp3d/convert.c
@@ -280,6 +280,7 @@ opj_volume_t* pgxtovolume(char *relpath, opj_cparameters_t *parameters)
     if (!sliceno) {
         fprintf(stdout,
                 "[ERROR] No slices with this pattern founded !! Please check input volume name\n");
+        closedir(dirp);
         return NULL;
     }
     /*if ( maxslice != sliceno) {
@@ -317,6 +318,7 @@ opj_volume_t* pgxtovolume(char *relpath, opj_cparameters_t *parameters)
         } else {
             fprintf(stdout, "[ERROR] Bad pgx header, please check input file\n");
             fclose(f);
+            closedir(dirp);
             return NULL;
         }
 
@@ -396,9 +398,7 @@ opj_volume_t* pgxtovolume(char *relpath, opj_cparameters_t *parameters)
         fclose(f);
     } /* for s --> sliceno*/
     comp->bpp = int_floorlog2(maxvalue) + 1;
-    if (sliceno != 1) {
-        closedir(dirp);
-    }
+    closedir(dirp);
     /*dump_volume(stdout, volume);*/
     return volume;
 }
@@ -581,6 +581,7 @@ opj_volume_t* bintovolume(char *filename, char *fileimg,
     f = fopen(filename, "rb");
     if (!f) {
         fprintf(stdout, "[ERROR] Failed to open %s for reading !!\n", filename);
+        opj_free(volume);
         return 0;
     }
 
@@ -918,7 +919,7 @@ opj_volume_t* imgtovolume(char *fileimg, opj_cparameters_t *parameters)
     f = fopen(filename, "rb");
     if (!f) {
         fprintf(stderr, "[ERROR] Failed to open %s for reading !!\n", filename);
-        fclose(f);
+        opj_free(volume);
         return 0;
     }
 

diff --git a/src/bin/jpip/opj_jpip_transcode.c b/src/bin/jpip/opj_jpip_transcode.c
index 6cd2604d6fdc81177773fc47f6fa423bfb12a939..bedd5cf9ca1a1625a0eb1ba87318a79784c0de0e 100644 (file)
--- a/src/bin/jpip/opj_jpip_transcode.c
+++ b/src/bin/jpip/opj_jpip_transcode.c
@@ -49,12 +49,14 @@ static int jpip_to_jp2(char *argv[])
     dec = init_jpipdecoder(OPJ_TRUE);
 
     if (!(fread_jpip(argv[1], dec))) {
+        destroy_jpipdecoder(&dec);
         return 1;
     }
 
     decode_jpip(dec);
 
     if (!(fwrite_jp2k(argv[2], dec))) {
+        destroy_jpipdecoder(&dec);
         return 1;
     }
 
@@ -83,12 +85,14 @@ static int jpip_to_j2k(char *argv[])
     dec = init_jpipdecoder(OPJ_FALSE);
 
     if (!(fread_jpip(argv[1], dec))) {
+        destroy_jpipdecoder(&dec);
         return 1;
     }
 
     decode_jpip(dec);
 
     if (!(fwrite_jp2k(argv[2], dec))) {
+        destroy_jpipdecoder(&dec);
         return 1;
     }
 

diff --git a/src/bin/jpwl/convert.c b/src/bin/jpwl/convert.c
index e6feea50124a7dc3f1cd848350729faa70a61ede..b7fb5b5c6bce4fe38b7084be3d37b72ea0068f07 100644 (file)
--- a/src/bin/jpwl/convert.c
+++ b/src/bin/jpwl/convert.c
@@ -465,6 +465,7 @@ int imagetotga(opj_image_t * image, const char *outfile)
                 || (image->comps[0].prec != image->comps[i + 1].prec)) {
             fprintf(stderr,
                     "Unable to create a tga file with such J2K image charateristics.");
+            fclose(fdest);
             return 1;
         }
     }
@@ -478,6 +479,7 @@ int imagetotga(opj_image_t * image, const char *outfile)
     /* Write TGA header  */
     bpp = write_alpha ? 32 : 24;
     if (!tga_writeheader(fdest, bpp, width, height, OPJ_TRUE)) {
+        fclose(fdest);
         return 1;
     }
 
@@ -510,6 +512,7 @@ int imagetotga(opj_image_t * image, const char *outfile)
             res = fwrite(&value, 1, 1, fdest);
             if (res < 1) {
                 fprintf(stderr, "failed to write 1 byte for %s\n", outfile);
+                fclose(fdest);
                 return 1;
             }
 
@@ -517,6 +520,7 @@ int imagetotga(opj_image_t * image, const char *outfile)
             res = fwrite(&value, 1, 1, fdest);
             if (res < 1) {
                 fprintf(stderr, "failed to write 1 byte for %s\n", outfile);
+                fclose(fdest);
                 return 1;
             }
 
@@ -524,6 +528,7 @@ int imagetotga(opj_image_t * image, const char *outfile)
             res = fwrite(&value, 1, 1, fdest);
             if (res < 1) {
                 fprintf(stderr, "failed to write 1 byte for %s\n", outfile);
+                fclose(fdest);
                 return 1;
             }
 
@@ -533,12 +538,15 @@ int imagetotga(opj_image_t * image, const char *outfile)
                 res = fwrite(&value, 1, 1, fdest);
                 if (res < 1) {
                     fprintf(stderr, "failed to write 1 byte for %s\n", outfile);
+                    fclose(fdest);
                     return 1;
                 }
             }
         }
     }
 
+    fclose(fdest);
+
     return 0;
 }
 
@@ -832,6 +840,7 @@ opj_image_t* bmptoimage(const char *filename, opj_cparameters_t *parameters)
         RGB = (unsigned char *) malloc(W * H * sizeof(unsigned char));
 
         if (fread(RGB, sizeof(unsigned char), W * H, IN) != W * H) {
+            fclose(IN);
             free(table_R);
             free(table_G);
             free(table_B);
@@ -1505,6 +1514,7 @@ int imagetopgx(opj_image_t * image, const char *outfile)
         fdest = fopen(name, "wb");
         if (!fdest) {
             fprintf(stderr, "ERROR -> failed to open %s for writing\n", name);
+            free(name);
             return 1;
         }
         /* don't need name anymore */

diff --git a/src/bin/jpwl/opj_jpwl_compress.c b/src/bin/jpwl/opj_jpwl_compress.c
index c17486a0b59182ac0a8b9bc3c3dacbe3adb65716..ccf0361500250046a2199b38f526e8f772ba21cc 100644 (file)
--- a/src/bin/jpwl/opj_jpwl_compress.c
+++ b/src/bin/jpwl/opj_jpwl_compress.c
@@ -1681,8 +1681,15 @@ int main(int argc, char **argv)
         if (dirptr) {
             dirptr->filename_buf = (char*)malloc(num_images * OPJ_PATH_LEN * sizeof(
                     char)); /* Stores at max 10 image file names*/
-            dirptr->filename = (char**) malloc(num_images * sizeof(char*));
             if (!dirptr->filename_buf) {
+                free(parameters.cp_comment);
+                free(dirptr);
+                return 0;
+            }
+            dirptr->filename = (char**) malloc(num_images * sizeof(char*));
+            if (!dirptr->filename) {
+                free(parameters.cp_comment);
+                free(dirptr);
                 return 0;
             }
             for (i = 0; i < num_images; i++) {
@@ -1690,9 +1697,13 @@ int main(int argc, char **argv)
             }
         }
         if (load_images(dirptr, img_fol.imgdirpath) == 1) {
+            free(parameters.cp_comment);
+            free(dirptr);
             return 0;
         }
         if (num_images == 0) {
+            free(parameters.cp_comment);
+            free(dirptr);
             fprintf(stdout, "Folder is empty\n");
             return 0;
         }
@@ -1850,6 +1861,7 @@ int main(int argc, char **argv)
             if (res < (size_t)codestream_length) {  /* FIXME */
                 fprintf(stderr, "failed to write %d (%s)\n", codestream_length,
                         parameters.outfile);
+                fclose(f);
                 return 1;
             }
             fclose(f);
@@ -1914,6 +1926,7 @@ int main(int argc, char **argv)
             if (res < (size_t)codestream_length) {  /* FIXME */
                 fprintf(stderr, "failed to write %d (%s)\n", codestream_length,
                         parameters.outfile);
+                fclose(f);
                 return 1;
             }
             fclose(f);

diff --git a/src/bin/jpwl/opj_jpwl_decompress.c b/src/bin/jpwl/opj_jpwl_decompress.c
index ffe84e54e4c4c3322325845e03a7900e0cdb7a37..a73be1c386b7a034908280ca0d3b4a64f1b11209 100644 (file)
--- a/src/bin/jpwl/opj_jpwl_decompress.c
+++ b/src/bin/jpwl/opj_jpwl_decompress.c
@@ -597,11 +597,16 @@ int main(int argc, char **argv)
         if (dirptr) {
             dirptr->filename_buf = (char*)malloc(num_images * OPJ_PATH_LEN * sizeof(
                     char)); /* Stores at max 10 image file names*/
-            dirptr->filename = (char**) malloc(num_images * sizeof(char*));
-
             if (!dirptr->filename_buf) {
+                free(dirptr);
+                return 1;
+            }
+            dirptr->filename = (char**) malloc(num_images * sizeof(char*));
+            if (!dirptr->filename) {
+                free(dirptr);
                 return 1;
             }
+
             for (i = 0; i < num_images; i++) {
                 dirptr->filename[i] = dirptr->filename_buf + i * OPJ_PATH_LEN;
             }

diff --git a/src/bin/mj2/mj2_to_metadata.c b/src/bin/mj2/mj2_to_metadata.c
index 44858c86a3e2d6c34e0bed5e0cfb20967f65a0cd..27f164d7c96de118c1aabac988f10954603467d1 100644 (file)
--- a/src/bin/mj2/mj2_to_metadata.c
+++ b/src/bin/mj2/mj2_to_metadata.c
@@ -304,6 +304,7 @@ int main(int argc, char *argv[])
     xmlout = fopen(outfile, "w"); /* was: argv[2] */
     if (!xmlout) {
         fprintf(stderr, "Failed to open %s for writing.\n", outfile); /* was: argv[2] */
+        fclose(file);
         return 1;
     }
     // Leave it open

diff --git a/src/bin/mj2/opj_mj2_compress.c b/src/bin/mj2/opj_mj2_compress.c
index c61b4c920a820ff6f521783352e501a0649cb8c2..8386ba0ef2e765bb7323d959425a2112487baf9c 100644 (file)
--- a/src/bin/mj2/opj_mj2_compress.c
+++ b/src/bin/mj2/opj_mj2_compress.c
@@ -708,6 +708,7 @@ int main(int argc, char **argv)
         yuv_num_frames(&movie->tk[0], mj2_parameters.infile);
 
     if (movie->tk[0].num_samples == 0) {
+        fclose(mj2file);
         return 1;
     }
 

diff --git a/src/bin/mj2/opj_mj2_decompress.c b/src/bin/mj2/opj_mj2_decompress.c
index 6b26d563664c1c3f759e2ff36d53e16aa1fbc764..6d1a96163a54cfc21d88c99f9461e143ff4db815 100644 (file)
--- a/src/bin/mj2/opj_mj2_decompress.c
+++ b/src/bin/mj2/opj_mj2_decompress.c
@@ -99,8 +99,9 @@ int main(int argc, char *argv[])
 
     /* Checking output file */
     outfile = fopen(argv[2], "w");
-    if (!file) {
+    if (!outfile) {
         fprintf(stderr, "failed to open %s for writing\n", argv[2]);
+        fclose(file);
         return 1;
     }
     fclose(outfile);
@@ -169,6 +170,7 @@ int main(int argc, char *argv[])
             if ((frame_codestream = (unsigned char*)
                                     realloc(frame_codestream, max_codstrm_size)) == NULL) {
                 printf("Error reallocation memory\n");
+                free(frame_codestream);
                 return 1;
             };
         }

diff --git a/src/lib/openjp3d/t2.c b/src/lib/openjp3d/t2.c
index a31bf83fd3e7bfc5cb3117a6ceabcebcbe8ab845..9856d1d98cb05358dce8db58658b64a91de1c008 100644 (file)
--- 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 eba9870f54a9b574be65dfe63bdf2d160a2308cc..8f364b6d55d2bdc5af820d34769b34d070cacc38 100644 (file)
--- 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 ce520640fe69b1aef1b9d309e48d3097b2f5807e..eb6b9d4c11679bc26b18046f4dd6a3d6a35cb221 100644 (file)
--- 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 2d7d683b5cc1bc435b85f60f843e4fce86324199..8975375273b423f9783b49691ab81ae2aba9f6bf 100644 (file)
--- 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 e6d1973b4ffdb3a1677ff42f8eb4fad0807f91cf..bb3f5eca42623350c4a6a651e8b370517b67bc21 100644 (file)
--- 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 7fa53136b9714fd77761a37c2c7588e32651e370..f9eb04fdca5460a7c9ab9a8d6c052244ed794ffb 100644 (file)
--- 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 8e036f182db6bb7727e91e7800471a2fddee3b77..3cbf83f57bc7df50bb3e183bb630490d0576895a 100644 (file)
--- 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 65aa3bc68ca29f0f1eff10e1c99a6c23b468958a..0d7816b85af165da3d2892e537c0fcf608420d1c 100644 (file)
--- 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);