diff options
| author | André Klitzing <aklitzing@gmail.com> | 2018-02-08 20:12:39 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-02-09 08:08:16 +0000 |
| commit | 25d7e0440f091b39c2865187eb0630045fa20e46 (patch) | |
| tree | 8348d2614f011b11047d1898c2084c05d0d74748 | |
| parent | 00e422c39b3c190acbf5609247a4172b45281d15 (diff) | |
| download | qtimageformats-25d7e0440f091b39c2865187eb0630045fa20e46.tar.gz | |
Add fix for CVE-2017-18013 of libtiff
http://bugzilla.maptools.org/show_bug.cgi?id=2770
Change-Id: I936b463b37fa922930cf122cfddf842d81ee796e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_print.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tif_print.c b/src/3rdparty/libtiff/libtiff/tif_print.c index 24d4b98..f494cfb 100644 --- a/src/3rdparty/libtiff/libtiff/tif_print.c +++ b/src/3rdparty/libtiff/libtiff/tif_print.c @@ -667,13 +667,13 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags) #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) fprintf(fd, " %3lu: [%8I64u, %8I64u]\n", (unsigned long) s, - (unsigned __int64) td->td_stripoffset[s], - (unsigned __int64) td->td_stripbytecount[s]); + td->td_stripoffset ? (unsigned __int64) td->td_stripoffset[s] : 0, + td->td_stripbytecount ? (unsigned __int64) td->td_stripbytecount[s] : 0); #else fprintf(fd, " %3lu: [%8llu, %8llu]\n", (unsigned long) s, - (unsigned long long) td->td_stripoffset[s], - (unsigned long long) td->td_stripbytecount[s]); + td->td_stripoffset ? (unsigned long long) td->td_stripoffset[s] : 0, + td->td_stripbytecount ? (unsigned long long) td->td_stripbytecount[s] : 0); #endif } } |