diff options
author | Even Rouault <even.rouault@spatialys.com> | 2016-10-25 20:04:21 +0000 |
---|---|---|
committer | Even Rouault <even.rouault@spatialys.com> | 2016-10-25 20:04:21 +0000 |
commit | 0c05834d05b36c2976dca77adb4cae42db3e43cd (patch) | |
tree | 88ead6243c691d97b8f47e7e86024c50938e7e26 /libtiff/tif_compress.c | |
parent | 0d521dfab0613833a7ce4c146f4f1411f6270105 (diff) | |
download | libtiff-git-0c05834d05b36c2976dca77adb4cae42db3e43cd.tar.gz |
* tools/tiffinfo.c: fix out-of-bound read on some tiled images.
(http://bugzilla.maptools.org/show_bug.cgi?id=2517)
* libtiff/tif_compress.c: make TIFFNoDecode() return 0 to indicate an
error and make upper level read routines treat it accordingly.
(linked to the test case of http://bugzilla.maptools.org/show_bug.cgi?id=2517)
Diffstat (limited to 'libtiff/tif_compress.c')
-rw-r--r-- | libtiff/tif_compress.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libtiff/tif_compress.c b/libtiff/tif_compress.c index f6b32df1..b571d195 100644 --- a/libtiff/tif_compress.c +++ b/libtiff/tif_compress.c @@ -1,4 +1,4 @@ -/* $Id: tif_compress.c,v 1.24 2015-11-22 15:31:03 erouault Exp $ */ +/* $Id: tif_compress.c,v 1.25 2016-10-25 20:04:22 erouault Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -82,7 +82,7 @@ TIFFNoDecode(TIFF* tif, const char* method) TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "Compression scheme %u %s decoding is not implemented", tif->tif_dir.td_compression, method); - return (-1); + return (0); } static int |