diff --git a/ChangeLog b/ChangeLog
index 1a6c779c..449555d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-13  Frank Warmerdam  <warmerdam@pobox.com>
+
+	* tools/tiff2pdf.c: terminate after failure of allocating 
+	ycbcr buffer (bug #2449, CVE-2013-4232)
+
 2013-07-09  Frank Warmerdam  <warmerdam@google.com>
 
 	* tools/tiffinfo.c: Default various values fetched with 
diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c
index 109f618b..951f44b5 100644
--- a/tools/tiff2pdf.c
+++ b/tools/tiff2pdf.c
@@ -1,4 +1,4 @@
-/* $Id: tiff2pdf.c,v 1.71 2013-05-02 14:54:08 tgl Exp $
+/* $Id: tiff2pdf.c,v 1.72 2013-08-14 05:11:37 fwarmerdam Exp $
  *
  * tiff2pdf - converts a TIFF image to a PDF document
  *
@@ -2461,7 +2461,8 @@ tsize_t t2p_readwrite_pdf_image(T2P* t2p, TIFF* input, TIFF* output){
 					(unsigned long) t2p->tiff_datasize, 
 					TIFFFileName(input));
 				t2p->t2p_error = T2P_ERR_ERROR;
-			  _TIFFfree(buffer);
+				_TIFFfree(buffer);
+				return(0);
 			} else {
 				buffer=samplebuffer;
 				t2p->tiff_datasize *= t2p->tiff_samplesperpixel;