From 7e000dd3604918784f87d147ecc62f93abcef1e1 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Wed, 18 Jul 2012 15:07:55 +0000
Subject: [PATCH] In tiff2pdf.c, fail when TIFFSetDirectory() fails.

---
 ChangeLog        | 6 ++++++
 tools/tiff2pdf.c | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e711fe8e..918369c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-18  Tom Lane  <tgl@sss.pgh.pa.us>
+
+	* tools/tiff2pdf.c: Fail when TIFFSetDirectory() fails.  This
+	prevents core dumps or perhaps even arbitrary code execution when
+	processing a corrupt input file (CVE-2012-3401).
+
 2012-07-06  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
 
 	* test/raw_decode.c (main): Test fixes to work with IJG JPEG 7+.
diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c
index 81431436..a6b520f8 100644
--- a/tools/tiff2pdf.c
+++ b/tools/tiff2pdf.c
@@ -1,4 +1,4 @@
-/* $Id: tiff2pdf.c,v 1.67 2012-06-15 21:51:54 fwarmerdam Exp $
+/* $Id: tiff2pdf.c,v 1.68 2012-07-18 15:07:55 tgl Exp $
  *
  * tiff2pdf - converts a TIFF image to a PDF document
  *
@@ -1066,6 +1066,7 @@ void t2p_read_tiff_init(T2P* t2p, TIFF* input){
 				"Can't set directory %u of input file %s", 
 				i,
 				TIFFFileName(input));
+			t2p->t2p_error = T2P_ERR_ERROR;
 			return;
 		}
 		if(TIFFGetField(input, TIFFTAG_PAGENUMBER, &pagen, &paged)){