mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-05-27 19:41:50 +02:00
gnu: libtiff: Fix CVE-2016-{10092,10093,10094} and others.
* gnu/packages/patches/libtiff-CVE-2016-10092.patch, gnu/packages/patches/libtiff-CVE-2016-10093.patch, gnu/packages/patches/libtiff-CVE-2016-10094.patch, gnu/packages/patches/libtiff-assertion-failure.patch, gnu/packages/patches/libtiff-divide-by-zero-ojpeg.patch, gnu/packages/patches/libtiff-divide-by-zero-tiffcp.patch, gnu/packages/patches/libtiff-divide-by-zero-tiffcrop.patch, gnu/packages/patches/libtiff-divide-by-zero.patch, gnu/packages/patches/libtiff-heap-overflow-pixarlog-luv.patch, gnu/packages/patches/libtiff-heap-overflow-tif-dirread.patch, gnu/packages/patches/libtiff-heap-overflow-tiffcp.patch, gnu/packages/patches/libtiff-heap-overflow-tiffcrop.patch, gnu/packages/patches/libtiff-invalid-read.patch, gnu/packages/patches/libtiff-null-dereference.patch, gnu/packages/patches/libtiff-tiffcp-underflow.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/image.scm (libtiff)[replacement]: New field. (libtiff/fixed): New variable.
This commit is contained in:
@@ -0,0 +1,60 @@
|
||||
Fix assertion failure in readSeparateTilesIntoBuffer():
|
||||
|
||||
http://bugzilla.maptools.org/show_bug.cgi?id=2605
|
||||
|
||||
2016-12-03 Even Rouault <even.rouault at spatialys.com>
|
||||
|
||||
* tools/tiffcp.c: replace assert( (bps % 8) == 0 ) by a non assert
|
||||
check.
|
||||
Reported by Agostino Sarubbo.
|
||||
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2605
|
||||
|
||||
/cvs/maptools/cvsroot/libtiff/ChangeLog,v <-- ChangeLog
|
||||
new revision: 1.1188; previous revision: 1.1187
|
||||
/cvs/maptools/cvsroot/libtiff/tools/tiffcp.c,v <-- tools/tiffcp.c
|
||||
new revision: 1.60; previous revision: 1.59
|
||||
|
||||
Index: libtiff/tools/tiffcp.c
|
||||
===================================================================
|
||||
RCS file: /cvs/maptools/cvsroot/libtiff/tools/tiffcp.c,v
|
||||
retrieving revision 1.59
|
||||
retrieving revision 1.60
|
||||
diff -u -r1.59 -r1.60
|
||||
--- libtiff/tools/tiffcp.c 3 Dec 2016 16:40:01 -0000 1.59
|
||||
+++ libtiff/tools/tiffcp.c 3 Dec 2016 16:50:02 -0000 1.60
|
||||
@@ -45,7 +45,6 @@
|
||||
#include <string.h>
|
||||
|
||||
#include <ctype.h>
|
||||
-#include <assert.h>
|
||||
|
||||
#ifdef HAVE_UNISTD_H
|
||||
# include <unistd.h>
|
||||
@@ -1393,7 +1392,12 @@
|
||||
status = 0;
|
||||
goto done;
|
||||
}
|
||||
- assert( bps % 8 == 0 );
|
||||
+ if( (bps % 8) != 0 )
|
||||
+ {
|
||||
+ TIFFError(TIFFFileName(in), "Error, cannot handle BitsPerSample that is not a multiple of 8");
|
||||
+ status = 0;
|
||||
+ goto done;
|
||||
+ }
|
||||
bytes_per_sample = bps/8;
|
||||
|
||||
for (row = 0; row < imagelength; row += tl) {
|
||||
@@ -1584,7 +1588,12 @@
|
||||
_TIFFfree(obuf);
|
||||
return 0;
|
||||
}
|
||||
- assert( bps % 8 == 0 );
|
||||
+ if( (bps % 8) != 0 )
|
||||
+ {
|
||||
+ TIFFError(TIFFFileName(out), "Error, cannot handle BitsPerSample that is not a multiple of 8");
|
||||
+ _TIFFfree(obuf);
|
||||
+ return 0;
|
||||
+ }
|
||||
bytes_per_sample = bps/8;
|
||||
|
||||
for (row = 0; row < imagelength; row += tl) {
|
||||
Reference in New Issue
Block a user