projects
/
openjpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jp3d/jpwl/mj2/jpip: Fix resource leaks (#1226)
[openjpeg.git]
/
src
/
bin
/
jpwl
/
convert.c
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.");
|| (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;
}
}
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)) {
/* Write TGA header */
bpp = write_alpha ? 32 : 24;
if (!tga_writeheader(fdest, bpp, width, height, OPJ_TRUE)) {
+ fclose(fdest);
return 1;
}
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);
res = fwrite(&value, 1, 1, fdest);
if (res < 1) {
fprintf(stderr, "failed to write 1 byte for %s\n", outfile);
+ fclose(fdest);
return 1;
}
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);
res = fwrite(&value, 1, 1, fdest);
if (res < 1) {
fprintf(stderr, "failed to write 1 byte for %s\n", outfile);
+ fclose(fdest);
return 1;
}
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);
res = fwrite(&value, 1, 1, fdest);
if (res < 1) {
fprintf(stderr, "failed to write 1 byte for %s\n", outfile);
+ fclose(fdest);
return 1;
}
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);
res = fwrite(&value, 1, 1, fdest);
if (res < 1) {
fprintf(stderr, "failed to write 1 byte for %s\n", outfile);
+ fclose(fdest);
return 1;
}
}
}
}
return 1;
}
}
}
}
+ fclose(fdest);
+
return 0;
}
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) {
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);
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);
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 */
return 1;
}
/* don't need name anymore */