libs/tiff/patches/125-CVE-2017-7594_part2.patch

   1 From 2ea32f7372b65c24b2816f11c04bf59b5090d05b Mon Sep 17 00:00:00 2001
   2 From: erouault <erouault>
   3 Date: Thu, 12 Jan 2017 19:23:20 +0000
   4 Subject: [PATCH] * libtiff/tif_ojpeg.c: fix leak in
   5  OJPEGReadHeaderInfoSecTablesQTable, OJPEGReadHeaderInfoSecTablesDcTable and
   6  OJPEGReadHeaderInfoSecTablesAcTable
   7
   8 ---
   9  ChangeLog           | 3 ++-
  10  libtiff/tif_ojpeg.c | 6 ++++++
  11  2 files changed, 8 insertions(+), 1 deletion(-)
  12
  13 diff --git a/ChangeLog b/ChangeLog
  14 index 12e0370..cd2fa17 100644
  15 --- a/ChangeLog
  16 +++ b/ChangeLog
  17 @@ -1,6 +1,7 @@
  18  2017-01-12 Even Rouault <even.rouault at spatialys.com>
  19
  20 -       * libtiff/tif_ojpeg.c: fix leak in OJPEGReadHeaderInfoSecTablesAcTable
  21 +       * libtiff/tif_ojpeg.c: fix leak in OJPEGReadHeaderInfoSecTablesQTable,
  22 +       OJPEGReadHeaderInfoSecTablesDcTable and OJPEGReadHeaderInfoSecTablesAcTable
  23         when read fails.
  24         Patch by Nicolás Peña.
  25         Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2659
  26 diff --git a/libtiff/tif_ojpeg.c b/libtiff/tif_ojpeg.c
  27 index b92f0eb..5f6c684 100644
  28 --- a/libtiff/tif_ojpeg.c
  29 +++ b/libtiff/tif_ojpeg.c
  30 @@ -1790,7 +1790,10 @@ OJPEGReadHeaderInfoSecTablesQTable(TIFF* tif)
  31                         TIFFSeekFile(tif,sp->qtable_offset[m],SEEK_SET);
  32                         p=(uint32)TIFFReadFile(tif,&ob[sizeof(uint32)+5],64);
  33                         if (p!=64)
  34 +                        {
  35 +                                _TIFFfree(ob);
  36                                 return(0);
  37 +                        }
  38                         sp->qtable[m]=ob;
  39                         sp->sof_tq[m]=m;
  40                 }
  41 @@ -1854,7 +1857,10 @@ OJPEGReadHeaderInfoSecTablesDcTable(TIFF* tif)
  42                                 rb[sizeof(uint32)+5+n]=o[n];
  43                         p=(uint32)TIFFReadFile(tif,&(rb[sizeof(uint32)+21]),q);
  44                         if (p!=q)
  45 +                        {
  46 +                                _TIFFfree(rb);
  47                                 return(0);
  48 +                        }
  49                         sp->dctable[m]=rb;
  50                         sp->sos_tda[m]=(m<<4);
  51                 }