diff options
| author | Nicolas Pena <npm@chromium.org> | 2017-07-20 14:35:29 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-07-20 19:19:51 +0000 |
| commit | c760024a54b92a2e091cfcae4d9bbb7d52e66374 (patch) | |
| tree | 21d5f0fb6fbe18a697f741e6c5676310c320f770 /third_party/libtiff/tif_zip.c | |
| parent | 77417ec9e1312a75407f8ab46dd46f777a1742f1 (diff) | |
| download | pdfium-c760024a54b92a2e091cfcae4d9bbb7d52e66374.tar.xz | |
Upgrade LibTIFF to 4.0.8
This CL upgrades LibTIFF, removing patch files that correspond to bugs
that have been resolved in 4.0.8.
Change-Id: Id99d2fc9b3f25993dcb60cf1558b73674eb725bf
Reviewed-on: https://pdfium-review.googlesource.com/8490
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'third_party/libtiff/tif_zip.c')
| -rw-r--r-- | third_party/libtiff/tif_zip.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/third_party/libtiff/tif_zip.c b/third_party/libtiff/tif_zip.c index 8c35aea83d..42943fbb14 100644 --- a/third_party/libtiff/tif_zip.c +++ b/third_party/libtiff/tif_zip.c @@ -1,4 +1,4 @@ -/* $Id: tif_zip.c,v 1.36 2016-11-12 16:48:28 erouault Exp $ */ +/* $Id: tif_zip.c,v 1.37 2017-05-10 15:21:16 erouault Exp $ */ /* * Copyright (c) 1995-1997 Sam Leffler @@ -107,7 +107,11 @@ ZIPSetupDecode(TIFF* tif) sp->state = 0; } - if (inflateInit(&sp->stream) != Z_OK) { + /* This function can possibly be called several times by */ + /* PredictorSetupDecode() if this function succeeds but */ + /* PredictorSetup() fails */ + if ((sp->state & ZSTATE_INIT_DECODE) == 0 && + inflateInit(&sp->stream) != Z_OK) { TIFFErrorExt(tif->tif_clientdata, module, "%s", SAFE_MSG(sp)); return (0); } else { |