mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-06 15:13:51 +02:00
tiff: Fix CVE-2019-6128
This commit is contained in:
parent
129f2243f0
commit
6ad86e29b8
2 changed files with 50 additions and 1 deletions
49
srcpkgs/tiff/patches/CVE-2019-6128.patch
Normal file
49
srcpkgs/tiff/patches/CVE-2019-6128.patch
Normal file
|
@ -0,0 +1,49 @@
|
||||||
|
From 0c74a9f49b8d7a36b17b54a7428b3526d20f88a8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Scott Gayou <github.scott@gmail.com>
|
||||||
|
Date: Wed, 23 Jan 2019 15:03:53 -0500
|
||||||
|
Subject: [PATCH] Fix for simple memory leak that was assigned CVE-2019-6128.
|
||||||
|
|
||||||
|
pal2rgb failed to free memory on a few errors. This was reported
|
||||||
|
here: http://bugzilla.maptools.org/show_bug.cgi?id=2836.
|
||||||
|
---
|
||||||
|
tools/pal2rgb.c | 7 ++++++-
|
||||||
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git tools/pal2rgb.c tools/pal2rgb.c
|
||||||
|
index 01d8502e..9492f1cf 100644
|
||||||
|
--- tools/pal2rgb.c
|
||||||
|
+++ tools/pal2rgb.c
|
||||||
|
@@ -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);
|
||||||
|
--
|
||||||
|
2.18.1
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'tiff'
|
# Template file for 'tiff'
|
||||||
pkgname=tiff
|
pkgname=tiff
|
||||||
version=4.0.10
|
version=4.0.10
|
||||||
revision=1
|
revision=2
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--enable-cxx --without-x"
|
configure_args="--enable-cxx --without-x"
|
||||||
hostmakedepends="automake libtool"
|
hostmakedepends="automake libtool"
|
||||||
|
|
Loading…
Add table
Reference in a new issue