aboutsummaryrefslogtreecommitdiffstats
path: root/main/tiff/0001-libtiff-tif_dirwrite.c-in-TIFFWriteDirectoryTagCheck.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/tiff/0001-libtiff-tif_dirwrite.c-in-TIFFWriteDirectoryTagCheck.patch')
-rw-r--r--main/tiff/0001-libtiff-tif_dirwrite.c-in-TIFFWriteDirectoryTagCheck.patch53
1 files changed, 0 insertions, 53 deletions
diff --git a/main/tiff/0001-libtiff-tif_dirwrite.c-in-TIFFWriteDirectoryTagCheck.patch b/main/tiff/0001-libtiff-tif_dirwrite.c-in-TIFFWriteDirectoryTagCheck.patch
deleted file mode 100644
index f1f8cec0c9..0000000000
--- a/main/tiff/0001-libtiff-tif_dirwrite.c-in-TIFFWriteDirectoryTagCheck.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 0abd094b6e5079c4d8be733829240491cb230f3d Mon Sep 17 00:00:00 2001
-From: erouault <erouault>
-Date: Wed, 11 Jan 2017 12:51:59 +0000
-Subject: [PATCH] * libtiff/tif_dirwrite.c: in
- TIFFWriteDirectoryTagCheckedRational, replace assertion by runtime check to
- error out if passed value is strictly negative. Fixes
- http://bugzilla.maptools.org/show_bug.cgi?id=2535
-
-* tools/tiffcrop.c: remove extraneous TIFFClose() in error code path, that
-caused double free.
-Related to http://bugzilla.maptools.org/show_bug.cgi?id=2535
----
- libtiff/tif_dirwrite.c | 9 +++++++--
- tools/tiffcrop.c | 1 -
- 3 files changed, 18 insertions(+), 3 deletions(-)
-
-diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c
-index 8a3341e8..c9e871be 100644
---- a/libtiff/tif_dirwrite.c
-+++ b/libtiff/tif_dirwrite.c
-@@ -2094,10 +2094,15 @@ TIFFWriteDirectoryTagCheckedSlong8Array(TIFF* tif, uint32* ndir, TIFFDirEntry* d
- static int
- TIFFWriteDirectoryTagCheckedRational(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, uint16 tag, double value)
- {
-+ static const char module[] = "TIFFWriteDirectoryTagCheckedRational";
- uint32 m[2];
-- assert(value>=0.0);
- assert(sizeof(uint32)==4);
-- if (value<=0.0)
-+ if( value < 0 )
-+ {
-+ TIFFErrorExt(tif->tif_clientdata,module,"Negative value is illegal");
-+ return 0;
-+ }
-+ else if (value==0.0)
- {
- m[0]=0;
- m[1]=1;
-diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
-index eecde217..648dbde9 100644
---- a/tools/tiffcrop.c
-+++ b/tools/tiffcrop.c
-@@ -7996,7 +7996,6 @@ writeCroppedImage(TIFF *in, TIFF *out, struct image_data *image,
- if (!TIFFWriteDirectory(out))
- {
- TIFFError("","Failed to write IFD for page number %d", pagenum);
-- TIFFClose(out);
- return (-1);
- }
-
---
-2.11.1
-