diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:17:11 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:17:11 +0100 |
| commit | 9839bdba39d7f96de11071b9c6ab4c9c6635a976 (patch) | |
| tree | 582412b12a05ff394979e011d13fd09c05c0856a /src/3rdparty/libtiff/libtiff/tif_aux.c | |
| parent | c7f2abe551c027a8eddb01dd7445dcf1fb829171 (diff) | |
| parent | 4d4de2e070178510afb7f160c2594ae7af34f782 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: If0c8e712f7521483df688ae9d33adea8b5fdaae5
Diffstat (limited to 'src/3rdparty/libtiff/libtiff/tif_aux.c')
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_aux.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tif_aux.c b/src/3rdparty/libtiff/libtiff/tif_aux.c index 3d35ba9..7f6721b 100644 --- a/src/3rdparty/libtiff/libtiff/tif_aux.c +++ b/src/3rdparty/libtiff/libtiff/tif_aux.c @@ -1,4 +1,4 @@ -/* $Id: tif_aux.c,v 1.29 2016-11-11 20:45:53 erouault Exp $ */ +/* $Id: tif_aux.c,v 1.30 2017-09-07 14:02:52 erouault Exp $ */ /* * Copyright (c) 1991-1997 Sam Leffler @@ -359,6 +359,13 @@ _TIFFUInt64ToDouble(uint64 ui64) } } +int _TIFFSeekOK(TIFF* tif, toff_t off) +{ + /* Huge offsets, expecially -1 / UINT64_MAX, can cause issues */ + /* See http://bugzilla.maptools.org/show_bug.cgi?id=2726 */ + return off <= (~(uint64)0)/2 && TIFFSeekFile(tif,off,SEEK_SET)==off; +} + /* vim: set ts=8 sts=8 sw=8 noet: */ /* * Local Variables: |