Commit ae0bed1f authored by Even Rouault's avatar Even Rouault

Merge branch 'master' into 'master'

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

See merge request !50
parents 933784a1 0c74a9f4
Pipeline #45883728 passed with stages
in 4 minutes and 32 seconds
......@@ -118,12 +118,14 @@ main(int argc, char* argv[])
shortv != PHOTOMETRIC_PALETTE) {
fprintf(stderr, "%s: Expecting a palette image.\n",
argv[optind]);
(void) TIFFClose(in);
return (-1);
}
if (!TIFFGetField(in, TIFFTAG_COLORMAP, &rmap, &gmap, &bmap)) {
fprintf(stderr,
"%s: No colormap (not a valid palette image).\n",
argv[optind]);
(void) TIFFClose(in);
return (-1);
}
bitspersample = 0;
......@@ -131,11 +133,14 @@ main(int argc, char* argv[])
if (bitspersample != 8) {
fprintf(stderr, "%s: Sorry, can only handle 8-bit images.\n",
argv[optind]);
(void) TIFFClose(in);
return (-1);
}
out = TIFFOpen(argv[optind+1], "w");
if (out == NULL)
if (out == NULL) {
(void) TIFFClose(in);
return (-2);
}
cpTags(in, out);
TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &imagewidth);
TIFFGetField(in, TIFFTAG_IMAGELENGTH, &imagelength);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment