[1.5] remove obvious memory leak from applications

diff --git a/CHANGES b/CHANGES
index b345557b4e9deb0febd769df26d4ac6900a3f3e8..9213c5858c2e21bcdce34d8dcc37504c10d5a87b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+October 20, 2011
+* [mickael] remove obvious memory leak from applications
+
 October 19, 2011
 * [mickael] backport rev 1013-1014 from trunk
 

diff --git a/applications/codec/j2k_dump.c b/applications/codec/j2k_dump.c
index b490f4d49d1ca0e3c6c755161b2b1f3a8adc2673..82b9f6f6a0437d0381c7196ab1f3001e3ee61fcd 100644 (file)
--- a/applications/codec/j2k_dump.c
+++ b/applications/codec/j2k_dump.c
@@ -418,6 +418,7 @@ int main(int argc, char *argv[])
                {
                        free(src);
                        fclose(fsrc);
+                       fclose(fout);
                        fprintf(stderr, "\nERROR: fread return a number of element different from the expected.\n");
                        return 1;
                }
@@ -452,6 +453,8 @@ int main(int argc, char *argv[])
                                fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
                                opj_destroy_decompress(dinfo);
                                opj_cio_close(cio);
+                               fclose(fout);
+                               free(src);
                                return 1;
                        }
                        /* dump image */
@@ -499,6 +502,8 @@ int main(int argc, char *argv[])
                                fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
                                opj_destroy_decompress(dinfo);
                                opj_cio_close(cio);
+                               fclose(fout);
+                               free(src);
                                return 1;
                        }
                        /* dump image */
@@ -550,6 +555,8 @@ int main(int argc, char *argv[])
                                fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
                                opj_destroy_decompress(dinfo);
                                opj_cio_close(cio);
+                               fclose(fout);
+                               free(src);
                                return 1;
                        }
 

diff --git a/applications/codec/j2k_to_image.c b/applications/codec/j2k_to_image.c
index 85bca04ccb8e65d0d66652359ce047372c463248..12e037c17dfb04b748337fd6e3369de77879e787 100644 (file)
--- a/applications/codec/j2k_to_image.c
+++ b/applications/codec/j2k_to_image.c
@@ -633,6 +633,7 @@ int main(int argc, char **argv) {
                                fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
                                opj_destroy_decompress(dinfo);
                                opj_cio_close(cio);
+                               free(src);
                                return 1;
                        }
 
@@ -675,6 +676,7 @@ int main(int argc, char **argv) {
                                fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
                                opj_destroy_decompress(dinfo);
                                opj_cio_close(cio);
+                               free(src);
                                return 1;
                        }
 
@@ -717,6 +719,7 @@ int main(int argc, char **argv) {
                                fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
                                opj_destroy_decompress(dinfo);
                                opj_cio_close(cio);
+                               free(src);
                                return 1;
                        }