Add upstream patches for CVE-2013-4243 (#996832)
This commit is contained in:
parent
4a936c7ba3
commit
19774ff309
41
libtiff-CVE-2013-4243.patch
Normal file
41
libtiff-CVE-2013-4243.patch
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
diff --git a/tools/gif2tiff.c b/tools/gif2tiff.c
|
||||||
|
index 2731273..ca824e2 100644
|
||||||
|
--- a/tools/gif2tiff.c
|
||||||
|
+++ b/tools/gif2tiff.c
|
||||||
|
@@ -280,6 +280,10 @@ readgifimage(char* mode)
|
||||||
|
fprintf(stderr, "no colormap present for image\n");
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
+ if (width == 0 || height == 0) {
|
||||||
|
+ fprintf(stderr, "Invalid value of width or height\n");
|
||||||
|
+ return(0);
|
||||||
|
+ }
|
||||||
|
if ((raster = (unsigned char*) _TIFFmalloc(width*height+EXTRAFUDGE)) == NULL) {
|
||||||
|
fprintf(stderr, "not enough memory for image\n");
|
||||||
|
return (0);
|
||||||
|
@@ -406,7 +410,11 @@ process(register int code, unsigned char** fill)
|
||||||
|
fprintf(stderr, "bad input: code=%d is larger than clear=%d\n",code, clear);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
- *(*fill)++ = suffix[code];
|
||||||
|
+ if (*fill >= raster + width*height) {
|
||||||
|
+ fprintf(stderr, "raster full before eoi code\n");
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+ *(*fill)++ = suffix[code];
|
||||||
|
firstchar = oldcode = code;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
@@ -436,7 +444,11 @@ process(register int code, unsigned char** fill)
|
||||||
|
}
|
||||||
|
oldcode = incode;
|
||||||
|
do {
|
||||||
|
- *(*fill)++ = *--stackp;
|
||||||
|
+ if (*fill >= raster + width*height) {
|
||||||
|
+ fprintf(stderr, "raster full before eoi code\n");
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+ *(*fill)++ = *--stackp;
|
||||||
|
} while (stackp > stack);
|
||||||
|
return 1;
|
||||||
|
}
|
@ -1,7 +1,7 @@
|
|||||||
Summary: Library of functions for manipulating TIFF format image files
|
Summary: Library of functions for manipulating TIFF format image files
|
||||||
Name: libtiff
|
Name: libtiff
|
||||||
Version: 4.0.3
|
Version: 4.0.3
|
||||||
Release: 14%{?dist}
|
Release: 15%{?dist}
|
||||||
|
|
||||||
License: libtiff
|
License: libtiff
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
@ -21,6 +21,7 @@ Patch8: libtiff-CVE-2013-4231.patch
|
|||||||
Patch9: libtiff-CVE-2013-4232.patch
|
Patch9: libtiff-CVE-2013-4232.patch
|
||||||
Patch10: libtiff-CVE-2013-4244.patch
|
Patch10: libtiff-CVE-2013-4244.patch
|
||||||
Patch11: libtiff-make-check.patch
|
Patch11: libtiff-make-check.patch
|
||||||
|
Patch12: libtiff-CVE-2013-4243.patch
|
||||||
|
|
||||||
BuildRequires: zlib-devel libjpeg-devel jbigkit-devel
|
BuildRequires: zlib-devel libjpeg-devel jbigkit-devel
|
||||||
BuildRequires: libtool automake autoconf pkgconfig
|
BuildRequires: libtool automake autoconf pkgconfig
|
||||||
@ -83,6 +84,7 @@ image files using the libtiff library.
|
|||||||
%patch9 -p1
|
%patch9 -p1
|
||||||
%patch10 -p1
|
%patch10 -p1
|
||||||
%patch11 -p1
|
%patch11 -p1
|
||||||
|
%patch12 -p1
|
||||||
|
|
||||||
# Use build system's libtool.m4, not the one in the package.
|
# Use build system's libtool.m4, not the one in the package.
|
||||||
rm -f libtool.m4
|
rm -f libtool.m4
|
||||||
@ -188,6 +190,9 @@ find html -name 'Makefile*' | xargs rm
|
|||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed May 21 2014 Petr Hracek <phracek@redhat.com> - 4.0.3-15
|
||||||
|
- Add upstream patches for CVE-2013-4243 (#996832)
|
||||||
|
|
||||||
* Thu Dec 19 2013 Petr Hracek <phracek@redhat.com> - 4.0.3-14
|
* Thu Dec 19 2013 Petr Hracek <phracek@redhat.com> - 4.0.3-14
|
||||||
- Fix: #1044609 Can't install both architectures
|
- Fix: #1044609 Can't install both architectures
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user