From 56a1976e9214d7f38249cc133dfcbf851683a498 Mon Sep 17 00:00:00 2001 From: Bob Friesenhahn Date: Sat, 8 Dec 2018 15:36:14 -0600 Subject: [PATCH] Do not attempt to re-sync zip stream after reported data error from inflate(). --- libtiff/tif_pixarlog.c | 4 ++-- libtiff/tif_zip.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libtiff/tif_pixarlog.c b/libtiff/tif_pixarlog.c index 7438d692..77620e3d 100644 --- a/libtiff/tif_pixarlog.c +++ b/libtiff/tif_pixarlog.c @@ -817,8 +817,8 @@ PixarLogDecode(TIFF* tif, uint8* op, tmsize_t occ, uint16 s) TIFFErrorExt(tif->tif_clientdata, module, "Decoding error at scanline %lu, %s", (unsigned long) tif->tif_row, sp->stream.msg ? sp->stream.msg : "(null)"); - if (inflateSync(&sp->stream) != Z_OK) - return (0); + /* if (inflateSync(&sp->stream) != Z_OK) */ + return (0); continue; } if (state != Z_OK) { diff --git a/libtiff/tif_zip.c b/libtiff/tif_zip.c index 9d4bceb1..b71c44e8 100644 --- a/libtiff/tif_zip.c +++ b/libtiff/tif_zip.c @@ -179,8 +179,8 @@ ZIPDecode(TIFF* tif, uint8* op, tmsize_t occ, uint16 s) TIFFErrorExt(tif->tif_clientdata, module, "Decoding error at scanline %lu, %s", (unsigned long) tif->tif_row, SAFE_MSG(sp)); - if (inflateSync(&sp->stream) != Z_OK) - return (0); + /* if (inflateSync(&sp->stream) != Z_OK) */ + return (0); continue; } if (state != Z_OK) {