libs/tiff/patches/017-LZW_compression_regression.patch

   1 From 9c45d2395863b793528518d64ddb97d8fdc200dd Mon Sep 17 00:00:00 2001
   2 From: Even Rouault <even.rouault@spatialys.com>
   3 Date: Tue, 11 Jul 2017 08:55:07 +0000
   4 Subject: [PATCH] * libtiff/tif_lzw.c: fix 4.0.8 regression in the decoding of
   5  old-style LZW compressed files.
   6
   7 ---
   8  ChangeLog         | 5 +++++
   9  libtiff/tif_lzw.c | 4 ++++
  10  2 files changed, 9 insertions(+)
  11
  12 diff --git a/ChangeLog b/ChangeLog
  13 index b0c84977..c5c74af7 100644
  14 --- a/ChangeLog
  15 +++ b/ChangeLog
  16 @@ -1,3 +1,8 @@
  17 +2017-07-11  Even Rouault <even.rouault at spatialys.com>
  18 +
  19 +       * libtiff/tif_lzw.c: fix 4.0.8 regression in the decoding of old-style LZW
  20 +       compressed files.
  21 +
  22  2017-06-30  Even Rouault <even.rouault at spatialys.com>
  23
  24         * libtiff/tif_dirwrite.c: in TIFFWriteDirectoryTagCheckedXXXX()
  25 diff --git a/libtiff/tif_lzw.c b/libtiff/tif_lzw.c
  26 index a2d01c90..f62b9e58 100644
  27 --- a/libtiff/tif_lzw.c
  28 +++ b/libtiff/tif_lzw.c
  29 @@ -655,6 +655,9 @@ LZWDecodeCompat(TIFF* tif, uint8* op0, tmsize_t occ0, uint16 s)
  30         }
  31
  32         bp = (unsigned char *)tif->tif_rawcp;
  33 +#ifdef LZW_CHECKEOS
  34 +       sp->dec_bitsleft = (((uint64)tif->tif_rawcc) << 3);
  35 +#endif
  36         nbits = sp->lzw_nbits;
  37         nextdata = sp->lzw_nextdata;
  38         nextbits = sp->lzw_nextbits;
  39 @@ -764,6 +767,7 @@ LZWDecodeCompat(TIFF* tif, uint8* op0, tmsize_t occ0, uint16 s)
  40                 }
  41         }
  42
  43 +       tif->tif_rawcc -= (tmsize_t)( (uint8*) bp - tif->tif_rawcp );
  44         tif->tif_rawcp = (uint8*) bp;
  45         sp->lzw_nbits = (unsigned short)nbits;
  46         sp->lzw_nextdata = nextdata;