summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2019-05-26 11:33:47 +0200
committerEven Rouault <even.rouault@spatialys.com>2019-05-26 11:33:47 +0200
commitf273e83262c9996fd18dd889e9ab8dda2f7a5c34 (patch)
treef5a20b34160fd88bbe9725c703a684d15d159f99
parentcc84dc7409605cac16845c34ccf3f61acb25b1c7 (diff)
downloadlibtiff-git-f273e83262c9996fd18dd889e9ab8dda2f7a5c34.tar.gz
Fix vulnerability in 'D' (DeferStrileLoad) mode (master only) (fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=14908)
-rw-r--r--libtiff/tif_dirread.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
index d1a557e3..bb5f3a65 100644
--- a/libtiff/tif_dirread.c
+++ b/libtiff/tif_dirread.c
@@ -6209,7 +6209,9 @@ static uint64 _TIFFGetStrileOffsetOrByteCountValue(TIFF *tif, uint32 strile,
{
if( pbErr )
*pbErr = 1;
- return 0;
+ /* Do not return, as we want this function to always */
+ /* return the same value if called several times with */
+ /* the same arguments */
}
}
else