diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-07-06 02:21:21 -0500 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-07-06 02:21:21 -0500 |
| commit | d9d3051169620f9c1e3aa6925d1ccd4a0e64004f (patch) | |
| tree | a107c65dae3ec16ec62a522a9f93d8d60b532fa9 /user/tiff/CVE-2017-18013.patch | |
| parent | 665faf54a6707c3d7ea1280987bf5857fd92568a (diff) | |
| download | packages-d9d3051169620f9c1e3aa6925d1ccd4a0e64004f.tar.gz packages-d9d3051169620f9c1e3aa6925d1ccd4a0e64004f.tar.bz2 packages-d9d3051169620f9c1e3aa6925d1ccd4a0e64004f.tar.xz packages-d9d3051169620f9c1e3aa6925d1ccd4a0e64004f.zip | |
user/tiff: pull in, take, fix
Diffstat (limited to 'user/tiff/CVE-2017-18013.patch')
| -rw-r--r-- | user/tiff/CVE-2017-18013.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/user/tiff/CVE-2017-18013.patch b/user/tiff/CVE-2017-18013.patch new file mode 100644 index 000000000..5a1d90082 --- /dev/null +++ b/user/tiff/CVE-2017-18013.patch @@ -0,0 +1,34 @@ +From c6f41df7b581402dfba3c19a1e3df4454c551a01 Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.rouault@spatialys.com> +Date: Sun, 31 Dec 2017 15:09:41 +0100 +Subject: [PATCH] libtiff/tif_print.c: TIFFPrintDirectory(): fix null pointer dereference on corrupted file. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2770 + +--- + libtiff/tif_print.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libtiff/tif_print.c b/libtiff/tif_print.c +index 9959d35..8deceb2 100644 +--- a/libtiff/tif_print.c ++++ b/libtiff/tif_print.c +@@ -665,13 +665,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 + } + } +-- +libgit2 0.26.0 + |