From: Mickael Savinaud <savmickael@users.noreply.github.com>
Date: Thu, 20 Oct 2011 16:36:45 +0000 (+0000)
Subject: [1.5] remove obvious memory leak from applications
X-Git-Tag: version.1.5~114
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=8d8841c84fb510bfbd6f0529b8c36b88da1d9c98;p=openjpeg.git

[1.5] remove obvious memory leak from applications
---

diff --git a/CHANGES b/CHANGES
index b345557b..9213c585 100644
--- 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 b490f4d4..82b9f6f6 100644
--- 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 85bca04c..12e037c1 100644
--- 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;
 			}