cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not attempt to re-sync zip stream after reported data error from inflate().

Browse Source
This commit is contained in:
Bob Friesenhahn 2018-12-08 15:36:14 -06:00
parent ae0325a1ab
commit 56a1976e92
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libtiff/tif_pixarlog.c
View File

@ -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) {

4
libtiff/tif_zip.c
View File

@ -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) {