|
|
- From 98ed6179dec22db48f6e235d8ca9e2708bf4e71a 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 4/4] 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 c68d6d2..5d0a669 100644
- --- a/libtiff/tif_dirwrite.c
- +++ b/libtiff/tif_dirwrite.c
- @@ -697,8 +697,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.0
-
|
