From c9f5a6aca91406b28b8416a4affb0676ad932b8b3951ba682e719dedc4c82101 Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Fri, 18 May 2018 09:24:19 +0000
Subject: [PATCH] Accepting request 610254 from home:pgajdos

- security update
  * CVE-2017-18013 [bsc#1074317]
    + tiff-CVE-2017-18013.patch

OBS-URL: https://build.opensuse.org/request/show/610254
OBS-URL: https://build.opensuse.org/package/show/graphics/tiff?expand=0&rev=117
---
 tiff-CVE-2017-18013.patch | 21 +++++++++++++++++++++
 tiff.changes              |  7 +++++++
 tiff.spec                 |  2 ++
 3 files changed, 30 insertions(+)
 create mode 100644 tiff-CVE-2017-18013.patch

diff --git a/tiff-CVE-2017-18013.patch b/tiff-CVE-2017-18013.patch
new file mode 100644
index 0000000..f3b428d
--- /dev/null
+++ b/tiff-CVE-2017-18013.patch
@@ -0,0 +1,21 @@
+--- 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
+ 	}
+ }
+
diff --git a/tiff.changes b/tiff.changes
index c1916f1..9446534 100644
--- a/tiff.changes
+++ b/tiff.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri May 18 09:18:26 UTC 2018 - pgajdos@suse.com
+
+- security update
+  * CVE-2017-18013 [bsc#1074317]
+    + tiff-CVE-2017-18013.patch
+
 -------------------------------------------------------------------
 Tue May 15 12:26:45 UTC 2018 - pgajdos@suse.com
 
diff --git a/tiff.spec b/tiff.spec
index 949e8ca..8466565 100644
--- a/tiff.spec
+++ b/tiff.spec
@@ -33,6 +33,7 @@ Patch1:         tiff-4.0.3-compress-warning.patch
 Patch2:         tiff-4.0.9-bsc1046077-CVE-2017-9935.patch
 Patch3:         tiff-4.0.9-bsc1081690-CVE-2018-5784.patch
 Patch4:         tiff-CVE-2018-10963.patch
+Patch5:         tiff-CVE-2017-18013.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  libjpeg-devel
@@ -99,6 +100,7 @@ the libtiff library.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 CFLAGS="%{optflags} -fPIE"