From db1b2741b413714c69f67842d40d78d793ef47e8 Mon Sep 17 00:00:00 2001

From: Even Rouault <even.rouault@spatialys.com>

Date: Sat, 12 May 2018 14:24:15 +0200

Subject: [PATCH 05/10] TIFFWriteDirectorySec: avoid assertion. Fixes

http://bugzilla.maptools.org/show_bug.cgi?id=2795. CVE-2018-10963

---

libtiff/tif_dirwrite.c | 7 +++++--

1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c

index fa68d1c..fd0d31c 100644

--- a/libtiff/tif_dirwrite.c

+++ b/libtiff/tif_dirwrite.c

@@ -688,8 +688,11 @@ TIFFWriteDirectorySec(TIFF* tif, int isimage, int imagedone, uint64* pdiroff)

}

break;

default:

- assert(0); /* we should never get here */

- break;

+ TIFFErrorExt(tif->tif_clientdata,module,

+ "Cannot write tag %d (%s)",

+ TIFFFieldTag(o),

+ o->field_name ? o->field_name : "unknown");

+ goto bad;

}

}

}

--

2.17.2