libs/tiff/patches/023-CVE-2017-18013.patch

   1 From b1997b9c3ac0d6bac5effd7558141986487217a9 Mon Sep 17 00:00:00 2001
   2 From: Even Rouault <even.rouault@spatialys.com>
   3 Date: Sun, 31 Dec 2017 15:09:41 +0100
   4 Subject: [PATCH 2/4] libtiff/tif_print.c: TIFFPrintDirectory(): fix null
   5  pointer dereference on corrupted file. Fixes
   6  http://bugzilla.maptools.org/show_bug.cgi?id=2770 / CVE-2017-18013
   7
   8 ---
   9  libtiff/tif_print.c | 8 ++++----
  10  1 file changed, 4 insertions(+), 4 deletions(-)
  11
  12 diff --git a/libtiff/tif_print.c b/libtiff/tif_print.c
  13 index 10a588e..b9b53a0 100644
  14 --- a/libtiff/tif_print.c
  15 +++ b/libtiff/tif_print.c
  16 @@ -667,13 +667,13 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags)
  17  #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
  18                         fprintf(fd, "    %3lu: [%8I64u, %8I64u]\n",
  19                             (unsigned long) s,
  20 -                           (unsigned __int64) td->td_stripoffset[s],
  21 -                           (unsigned __int64) td->td_stripbytecount[s]);
  22 +                           td->td_stripoffset ? (unsigned __int64) td->td_stripoffset[s] : 0,
  23 +                           td->td_stripbytecount ? (unsigned __int64) td->td_stripbytecount[s] : 0);
  24  #else
  25                         fprintf(fd, "    %3lu: [%8llu, %8llu]\n",
  26                             (unsigned long) s,
  27 -                           (unsigned long long) td->td_stripoffset[s],
  28 -                           (unsigned long long) td->td_stripbytecount[s]);
  29 +                           td->td_stripoffset ? (unsigned long long) td->td_stripoffset[s] : 0,
  30 +                           td->td_stripbytecount ? (unsigned long long) td->td_stripbytecount[s] : 0);
  31  #endif
  32         }
  33  }
  34 --
  35 2.17.0
  36