Blame SOURCES/libtiff-CVE-2018-10963.patch

21ff78
From 98ed6179dec22db48f6e235d8ca9e2708bf4e71a Mon Sep 17 00:00:00 2001
21ff78
From: Even Rouault <even.rouault@spatialys.com>
21ff78
Date: Sat, 12 May 2018 14:24:15 +0200
21ff78
Subject: [PATCH 4/4] TIFFWriteDirectorySec: avoid assertion. Fixes
21ff78
 http://bugzilla.maptools.org/show_bug.cgi?id=2795. CVE-2018-10963
21ff78
21ff78
---
21ff78
 libtiff/tif_dirwrite.c | 7 +++++--
21ff78
 1 file changed, 5 insertions(+), 2 deletions(-)
21ff78
21ff78
diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c
21ff78
index c68d6d2..5d0a669 100644
21ff78
--- a/libtiff/tif_dirwrite.c
21ff78
+++ b/libtiff/tif_dirwrite.c
21ff78
@@ -697,8 +697,11 @@ TIFFWriteDirectorySec(TIFF* tif, int isimage, int imagedone, uint64* pdiroff)
21ff78
 								}
21ff78
 								break;
21ff78
 							default:
21ff78
-								assert(0);   /* we should never get here */
21ff78
-								break;
21ff78
+								TIFFErrorExt(tif->tif_clientdata,module,
21ff78
+								            "Cannot write tag %d (%s)",
21ff78
+								            TIFFFieldTag(o),
21ff78
+                                                                            o->field_name ? o->field_name : "unknown");
21ff78
+								goto bad;
21ff78
 						}
21ff78
 					}
21ff78
 				}
21ff78
-- 
21ff78
2.17.0
21ff78