cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for simple memory leak that was assigned CVE-2019-6128.

Browse Source 
pal2rgb failed to free memory on a few errors. This was reported
here: http://bugzilla.maptools.org/show_bug.cgi?id=2836.
This commit is contained in:
Scott Gayou 2019-01-23 15:03:53 -05:00
parent a0e273fdca
commit 0c74a9f49b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/pal2rgb.c
View File

@ -118,12 +118,14 @@ main(int argc, char* argv[])
shortv != PHOTOMETRIC_PALETTE) { shortv != PHOTOMETRIC_PALETTE) {
fprintf(stderr, "%s: Expecting a palette image.\n", fprintf(stderr, "%s: Expecting a palette image.\n",
argv[optind]); argv[optind]);
(void) TIFFClose(in);
return (-1); return (-1);
} }
if (!TIFFGetField(in, TIFFTAG_COLORMAP, &rmap, &gmap, &bmap)) { if (!TIFFGetField(in, TIFFTAG_COLORMAP, &rmap, &gmap, &bmap)) {
fprintf(stderr, fprintf(stderr,
"%s: No colormap (not a valid palette image).\n", "%s: No colormap (not a valid palette image).\n",
argv[optind]); argv[optind]);
(void) TIFFClose(in);
return (-1); return (-1);
} }
bitspersample = 0; bitspersample = 0;
@ -131,11 +133,14 @@ main(int argc, char* argv[])
if (bitspersample != 8) { if (bitspersample != 8) {
fprintf(stderr, "%s: Sorry, can only handle 8-bit images.\n", fprintf(stderr, "%s: Sorry, can only handle 8-bit images.\n",
argv[optind]); argv[optind]);
(void) TIFFClose(in);
return (-1); return (-1);
} }
out = TIFFOpen(argv[optind+1], "w"); out = TIFFOpen(argv[optind+1], "w");
if (out == NULL) if (out == NULL) {
(void) TIFFClose(in);
return (-2); return (-2);
}
cpTags(in, out); cpTags(in, out);
TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &imagewidth); TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &imagewidth);
TIFFGetField(in, TIFFTAG_IMAGELENGTH, &imagelength); TIFFGetField(in, TIFFTAG_IMAGELENGTH, &imagelength);