walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

fix resource leak in jpwl 

Fixes #573
This commit is contained in:
mayeut 2015-09-06 17:18:37 +02:00
parent 15d07f33d1
commit c31fb68ccc
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/jpwl/convert.c
View File

@ -2858,6 +2858,7 @@ opj_image_t* rawtoimage(const char *filename, opj_cparameters_t *parameters, raw
for (i = 0; i < w * h; i++) { for (i = 0; i < w * h; i++) {
if (!fread(&value, 1, 1, f)) { if (!fread(&value, 1, 1, f)) {
fprintf(stderr,"Error reading raw file. End of file probably reached.\n"); fprintf(stderr,"Error reading raw file. End of file probably reached.\n");
fclose(f);
return NULL; return NULL;
} }
image->comps[compno].data[i] = raw_cp->rawSigned?(char)value:value; image->comps[compno].data[i] = raw_cp->rawSigned?(char)value:value;
@ -2872,11 +2873,13 @@ opj_image_t* rawtoimage(const char *filename, opj_cparameters_t *parameters, raw
unsigned char temp; unsigned char temp;
if (!fread(&temp, 1, 1, f)) { if (!fread(&temp, 1, 1, f)) {
fprintf(stderr,"Error reading raw file. End of file probably reached.\n"); fprintf(stderr,"Error reading raw file. End of file probably reached.\n");
fclose(f);
return NULL; return NULL;
} }
value = temp << 8; value = temp << 8;
if (!fread(&temp, 1, 1, f)) { if (!fread(&temp, 1, 1, f)) {
fprintf(stderr,"Error reading raw file. End of file probably reached.\n"); fprintf(stderr,"Error reading raw file. End of file probably reached.\n");
fclose(f);
return NULL; return NULL;
} }
value += temp; value += temp;
@ -2886,6 +2889,7 @@ opj_image_t* rawtoimage(const char *filename, opj_cparameters_t *parameters, raw
} }
else { else {
fprintf(stderr,"OpenJPEG cannot encode raw components with bit depth higher than 16 bits.\n"); fprintf(stderr,"OpenJPEG cannot encode raw components with bit depth higher than 16 bits.\n");
fclose(f);
return NULL; return NULL;
} }