diff -Naur tiff-3.9.4.orig/contrib/dbs/xtiff/xtiff.c tiff-3.9.4/contrib/dbs/xtiff/xtiff.c

--- tiff-3.9.4.orig/contrib/dbs/xtiff/xtiff.c	2010-06-08 14:50:40.000000000 -0400

+++ tiff-3.9.4/contrib/dbs/xtiff/xtiff.c	2013-04-16 12:52:23.876253257 -0400

@@ -512,9 +512,9 @@

     Arg args[1];

     if (tfMultiPage)

-        sprintf(buffer, "%s - page %d", fileName, tfDirectory);

+        snprintf(buffer, sizeof(buffer), "%s - page %d", fileName, tfDirectory);

     else

-        strcpy(buffer, fileName);

+        snprintf(buffer, sizeof(buffer), "%s", fileName);

     XtSetArg(args[0], XtNlabel, buffer);

     XtSetValues(labelWidget, args, 1);

 }

diff -Naur tiff-3.9.4.orig/libtiff/tif_codec.c tiff-3.9.4/libtiff/tif_codec.c

--- tiff-3.9.4.orig/libtiff/tif_codec.c	2010-06-08 14:50:41.000000000 -0400

+++ tiff-3.9.4/libtiff/tif_codec.c	2013-04-16 12:52:23.876253257 -0400

@@ -104,7 +104,8 @@

 	const TIFFCodec* c = TIFFFindCODEC(tif->tif_dir.td_compression);

         char compression_code[20];

-        sprintf( compression_code, "%d", tif->tif_dir.td_compression );

+        snprintf(compression_code, sizeof(compression_code), "%d",

+		 tif->tif_dir.td_compression );

 	TIFFErrorExt(tif->tif_clientdata, tif->tif_name,

                      "%s compression support is not configured", 

                      c ? c->name : compression_code );

diff -Naur tiff-3.9.4.orig/libtiff/tif_dirinfo.c tiff-3.9.4/libtiff/tif_dirinfo.c

--- tiff-3.9.4.orig/libtiff/tif_dirinfo.c	2010-06-09 17:15:27.000000000 -0400

+++ tiff-3.9.4/libtiff/tif_dirinfo.c	2013-04-16 12:52:23.877253102 -0400

@@ -873,7 +873,7 @@

 	 * note that this name is a special sign to TIFFClose() and

 	 * _TIFFSetupFieldInfo() to free the field

 	 */

-	sprintf(fld->field_name, "Tag %d", (int) tag);

+	snprintf(fld->field_name, 32, "Tag %d", (int) tag);

 	return fld;    

 }

diff -Naur tiff-3.9.4.orig/tools/rgb2ycbcr.c tiff-3.9.4/tools/rgb2ycbcr.c

--- tiff-3.9.4.orig/tools/rgb2ycbcr.c	2010-06-08 14:50:44.000000000 -0400

+++ tiff-3.9.4/tools/rgb2ycbcr.c	2013-04-16 12:52:23.878252947 -0400

@@ -326,7 +326,8 @@

 	TIFFSetField(out, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);

 	{ char buf[2048];

 	  char *cp = strrchr(TIFFFileName(in), '/');

-	  sprintf(buf, "YCbCr conversion of %s", cp ? cp+1 : TIFFFileName(in));

+	  snprintf(buf, sizeof(buf), "YCbCr conversion of %s",

+		   cp ? cp+1 : TIFFFileName(in));

 	  TIFFSetField(out, TIFFTAG_IMAGEDESCRIPTION, buf);

 	}

 	TIFFSetField(out, TIFFTAG_SOFTWARE, TIFFGetVersion());

diff -Naur tiff-3.9.4.orig/tools/tiff2bw.c tiff-3.9.4/tools/tiff2bw.c

--- tiff-3.9.4.orig/tools/tiff2bw.c	2010-06-08 14:50:44.000000000 -0400

+++ tiff-3.9.4/tools/tiff2bw.c	2013-04-16 12:52:23.879252793 -0400

@@ -201,7 +201,7 @@

 		}

 	}

 	TIFFSetField(out, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK);

-	sprintf(thing, "B&W version of %s", argv[optind]);

+	snprintf(thing, sizeof(thing), "B&W version of %s", argv[optind]);

 	TIFFSetField(out, TIFFTAG_IMAGEDESCRIPTION, thing);

 	TIFFSetField(out, TIFFTAG_SOFTWARE, "tiff2bw");

 	outbuf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(out));

diff -Naur tiff-3.9.4.orig/tools/tiff2pdf.c tiff-3.9.4/tools/tiff2pdf.c

--- tiff-3.9.4.orig/tools/tiff2pdf.c	2013-04-16 12:51:14.647783499 -0400

+++ tiff-3.9.4/tools/tiff2pdf.c	2013-04-16 12:56:34.501865141 -0400

@@ -3662,7 +3662,9 @@

 	char buffer[16];

 	int buflen=0;

-	buflen=sprintf(buffer, "%%PDF-%u.%u ", t2p->pdf_majorversion&0xff, t2p->pdf_minorversion&0xff);

+	buflen = snprintf(buffer, sizeof(buffer), "%%PDF-%u.%u ",

+			  t2p->pdf_majorversion&0xff,

+			  t2p->pdf_minorversion&0xff);

 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 	written += t2pWriteFile(output, (tdata_t)"\n%\342\343\317\323\n", 7);

@@ -3676,10 +3678,10 @@

 tsize_t t2p_write_pdf_obj_start(uint32 number, TIFF* output){

 	tsize_t written=0;

-	char buffer[16];

+	char buffer[32];

 	int buflen=0;

-	buflen=sprintf(buffer, "%lu", (unsigned long)number);

+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)number);

 	written += t2pWriteFile(output, (tdata_t) buffer, buflen );

 	written += t2pWriteFile(output, (tdata_t) " 0 obj\n", 7);

@@ -3718,13 +3720,13 @@

 	written += t2pWriteFile(output, (tdata_t) "/", 1);

 	for (i=0;i

 		if ( ((unsigned char)name[i]) < 0x21){

-			sprintf(buffer, "#%.2X", name[i]);

+			snprintf(buffer, sizeof(buffer), "#%.2X", name[i]);

 			buffer[sizeof(buffer) - 1] = '\0';

 			written += t2pWriteFile(output, (tdata_t) buffer, 3);

 			nextchar=1;

 		}

 		if ( ((unsigned char)name[i]) > 0x7E){

-			sprintf(buffer, "#%.2X", name[i]);

+			snprintf(buffer, sizeof(buffer), "#%.2X", name[i]);

 			buffer[sizeof(buffer) - 1] = '\0';

 			written += t2pWriteFile(output, (tdata_t) buffer, 3);

 			nextchar=1;

@@ -3732,57 +3734,57 @@

 		if (nextchar==0){

 			switch (name[i]){

 				case 0x23:

-					sprintf(buffer, "#%.2X", name[i]);

+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]);

 					buffer[sizeof(buffer) - 1] = '\0';

 					written += t2pWriteFile(output, (tdata_t) buffer, 3);

 					break;

 				case 0x25:

-					sprintf(buffer, "#%.2X", name[i]);

+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]);

 					buffer[sizeof(buffer) - 1] = '\0';

 					written += t2pWriteFile(output, (tdata_t) buffer, 3);

 					break;

 				case 0x28:

-					sprintf(buffer, "#%.2X", name[i]);

+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]);

 					buffer[sizeof(buffer) - 1] = '\0';

 					written += t2pWriteFile(output, (tdata_t) buffer, 3);

 					break;

 				case 0x29:

-					sprintf(buffer, "#%.2X", name[i]); 

+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); 

 					buffer[sizeof(buffer) - 1] = '\0';

 					written += t2pWriteFile(output, (tdata_t) buffer, 3);

 					break;

 				case 0x2F:

-					sprintf(buffer, "#%.2X", name[i]); 

+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); 

 					buffer[sizeof(buffer) - 1] = '\0';

 					written += t2pWriteFile(output, (tdata_t) buffer, 3);

 					break;

 				case 0x3C:

-					sprintf(buffer, "#%.2X", name[i]); 

+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); 

 					buffer[sizeof(buffer) - 1] = '\0';

 					written += t2pWriteFile(output, (tdata_t) buffer, 3);

 					break;

 				case 0x3E:

-					sprintf(buffer, "#%.2X", name[i]);

+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]);

 					buffer[sizeof(buffer) - 1] = '\0';

 					written += t2pWriteFile(output, (tdata_t) buffer, 3);

 					break;

 				case 0x5B:

-					sprintf(buffer, "#%.2X", name[i]); 

+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); 

 					buffer[sizeof(buffer) - 1] = '\0';

 					written += t2pWriteFile(output, (tdata_t) buffer, 3);

 					break;

 				case 0x5D:

-					sprintf(buffer, "#%.2X", name[i]);

+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]);

 					buffer[sizeof(buffer) - 1] = '\0';

 					written += t2pWriteFile(output, (tdata_t) buffer, 3);

 					break;

 				case 0x7B:

-					sprintf(buffer, "#%.2X", name[i]); 

+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); 

 					buffer[sizeof(buffer) - 1] = '\0';

 					written += t2pWriteFile(output, (tdata_t) buffer, 3);

 					break;

 				case 0x7D:

-					sprintf(buffer, "#%.2X", name[i]); 

+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); 

 					buffer[sizeof(buffer) - 1] = '\0';

 					written += t2pWriteFile(output, (tdata_t) buffer, 3);

 					break;

@@ -3812,7 +3814,7 @@

 	written += t2pWriteFile(output, (tdata_t) "(", 1);

 	for (i=0; i

 		if((pdfstr[i]&0x80) || (pdfstr[i]==127) || (pdfstr[i]<32)){

-			sprintf(buffer, "\\%.3hho", pdfstr[i]);

+			snprintf(buffer, sizeof(buffer), "\\%.3hho", pdfstr[i]);

 			buffer[sizeof(buffer) - 1] = '\0';

 			written += t2pWriteFile(output, (tdata_t) buffer, 4);

 		} else {

@@ -3898,14 +3900,14 @@

 tsize_t t2p_write_pdf_stream_dict(tsize_t len, uint32 number, TIFF* output){

 	tsize_t written=0;

-	char buffer[16];

+	char buffer[32];

 	int buflen=0;

 	written += t2pWriteFile(output, (tdata_t) "/Length ", 8);

 	if(len!=0){

 		written += t2p_write_pdf_stream_length(len, output);

 	} else {

-		buflen=sprintf(buffer, "%lu", (unsigned long)number);

+		buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)number);

 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 		written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6);

 	}

@@ -3946,10 +3948,10 @@

 tsize_t t2p_write_pdf_stream_length(tsize_t len, TIFF* output){

 	tsize_t written=0;

-	char buffer[16];

+	char buffer[32];

 	int buflen=0;

-	buflen=sprintf(buffer, "%lu", (unsigned long)len);

+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)len);

 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 	written += t2pWriteFile(output, (tdata_t) "\n", 1);

@@ -3963,13 +3965,13 @@

 tsize_t t2p_write_pdf_catalog(T2P* t2p, TIFF* output){

 	tsize_t written=0;

-	char buffer[16];

+	char buffer[32];

 	int buflen=0;

 	written += t2pWriteFile(output, 

 		(tdata_t)"<< \n/Type /Catalog \n/Pages ", 

 		27);

-	buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_pages);

+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_pages);

 	written += t2pWriteFile(output, (tdata_t) buffer, buflen );

 	written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6);

 	if(t2p->pdf_fitwindow){

@@ -4003,8 +4005,7 @@

 		written += t2p_write_pdf_string(t2p->pdf_datetime, output);

 	}

 	written += t2pWriteFile(output, (tdata_t) "\n/Producer ", 11);

-	_TIFFmemset((tdata_t)buffer, 0x00, sizeof(buffer));

-	buflen = sprintf(buffer, "libtiff / tiff2pdf - %d", TIFFLIB_VERSION);

+	buflen = snprintf(buffer, sizeof(buffer), "libtiff / tiff2pdf - %d", TIFFLIB_VERSION);

 	written += t2p_write_pdf_string((unsigned char*)buffer, output);

 	written += t2pWriteFile(output, (tdata_t) "\n", 1);

 	if(t2p->pdf_creator != NULL){ 

@@ -4179,7 +4180,7 @@

 {

 	tsize_t written=0;

 	tdir_t i=0;

-	char buffer[16];

+	char buffer[32];

 	int buflen=0;

 	int page=0;

@@ -4187,7 +4188,7 @@

 		(tdata_t) "<< \n/Type /Pages \n/Kids [ ", 26);

 	page = t2p->pdf_pages+1;

 	for (i=0;i<t2p->tiff_pagecount;i++){

-		buflen=sprintf(buffer, "%d", page);

+		buflen=snprintf(buffer, sizeof(buffer), "%d", page);

 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 		written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);

 		if ( ((i+1)%8)==0 ) {

@@ -4202,8 +4203,7 @@

 		}

 	}

 	written += t2pWriteFile(output, (tdata_t) "] \n/Count ", 10);

-	_TIFFmemset(buffer, 0x00, 16);

-	buflen=sprintf(buffer, "%d", t2p->tiff_pagecount);

+	buflen=snprintf(buffer, sizeof(buffer), "%d", t2p->tiff_pagecount);

 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 	written += t2pWriteFile(output, (tdata_t) " \n>> \n", 6);

@@ -4218,28 +4218,28 @@

 	unsigned int i=0;

 	tsize_t written=0;

-	char buffer[16];

+	char buffer[256];

 	int buflen=0;

 	written += t2pWriteFile(output, (tdata_t) "<<\n/Type /Page \n/Parent ", 24);

-	buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_pages);

+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_pages);

 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 	written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6);

 	written += t2pWriteFile(output, (tdata_t) "/MediaBox [", 11); 

-	buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.x1);

+	buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.x1);

 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 	written += t2pWriteFile(output, (tdata_t) " ", 1); 

-	buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.y1);

+	buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.y1);

 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 	written += t2pWriteFile(output, (tdata_t) " ", 1); 

-	buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.x2);

+	buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.x2);

 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 	written += t2pWriteFile(output, (tdata_t) " ", 1); 

-	buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.y2);

+	buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.y2);

 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 	written += t2pWriteFile(output, (tdata_t) "] \n", 3); 

 	written += t2pWriteFile(output, (tdata_t) "/Contents ", 10);

-	buflen=sprintf(buffer, "%lu", (unsigned long)(object + 1));

+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(object + 1));

 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 	written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6);

 	written += t2pWriteFile(output, (tdata_t) "/Resources << \n", 15);

@@ -4247,15 +4247,13 @@

 		written += t2pWriteFile(output, (tdata_t) "/XObject <<\n", 12);

 		for(i=0;i<t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount;i++){

 			written += t2pWriteFile(output, (tdata_t) "/Im", 3);

-			buflen = sprintf(buffer, "%u", t2p->pdf_page+1);

+			buflen = snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1);

 			written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 			written += t2pWriteFile(output, (tdata_t) "_", 1);

-			buflen = sprintf(buffer, "%u", i+1);

+			buflen = snprintf(buffer, sizeof(buffer), "%u", i+1);

 			written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 			written += t2pWriteFile(output, (tdata_t) " ", 1);

-			buflen = sprintf(

-				buffer, 

-				"%lu", 

+			buflen = snprintf(buffer, sizeof(buffer), "%lu",

 				(unsigned long)(object+3+(2*i)+t2p->tiff_pages[t2p->pdf_page].page_extra)); 

 			written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 			written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);

@@ -4267,12 +4265,10 @@

 	} else {

 			written += t2pWriteFile(output, (tdata_t) "/XObject <<\n", 12);

 			written += t2pWriteFile(output, (tdata_t) "/Im", 3);

-			buflen = sprintf(buffer, "%u", t2p->pdf_page+1);

+			buflen = snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1);

 			written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 			written += t2pWriteFile(output, (tdata_t) " ", 1);

-			buflen = sprintf(

-				buffer, 

-				"%lu", 

+			buflen = snprintf(buffer, sizeof(buffer), "%lu",

 				(unsigned long)(object+3+(2*i)+t2p->tiff_pages[t2p->pdf_page].page_extra)); 

 			written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 			written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);

@@ -4281,9 +4277,7 @@

 	if(t2p->tiff_transferfunctioncount != 0) {

 		written += t2pWriteFile(output, (tdata_t) "/ExtGState <<", 13);

 		t2pWriteFile(output, (tdata_t) "/GS1 ", 5);

-		buflen = sprintf(

-			buffer, 

-			"%lu", 

+		buflen = snprintf(buffer, sizeof(buffer), "%lu",

 			(unsigned long)(object + 3)); 

 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 		written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);

@@ -4644,7 +4638,7 @@

 	if(t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount>0){ 

 		for(i=0;i<t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount; i++){

 			box=t2p->tiff_tiles[t2p->pdf_page].tiles_tiles[i].tile_box;

-			buflen=sprintf(buffer, 

+			buflen=snprintf(buffer, sizeof(buffer), 

 				"q %s %.4f %.4f %.4f %.4f %.4f %.4f cm /Im%d_%ld Do Q\n", 

 				t2p->tiff_transferfunctioncount?"/GS1 gs ":"",

 				box.mat[0],

@@ -4659,7 +4653,7 @@

 		}

 	} else {

 		box=t2p->pdf_imagebox;

-		buflen=sprintf(buffer, 

+		buflen=snprintf(buffer, sizeof(buffer), 

 			"q %s %.4f %.4f %.4f %.4f %.4f %.4f cm /Im%d Do Q\n", 

 			t2p->tiff_transferfunctioncount?"/GS1 gs ":"",

 			box.mat[0],

@@ -4684,59 +4678,48 @@

 												TIFF* output){

 	tsize_t written=0;

-	char buffer[16];

+	char buffer[32];

 	int buflen=0;

 	written += t2p_write_pdf_stream_dict(0, t2p->pdf_xrefcount+1, output); 

 	written += t2pWriteFile(output, 

 		(tdata_t) "/Type /XObject \n/Subtype /Image \n/Name /Im", 

 		42);

-	buflen=sprintf(buffer, "%u", t2p->pdf_page+1);

+	buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1);

 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 	if(tile != 0){

 		written += t2pWriteFile(output, (tdata_t) "_", 1);

-		buflen=sprintf(buffer, "%lu", (unsigned long)tile);

+		buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)tile);

 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 	}

 	written += t2pWriteFile(output, (tdata_t) "\n/Width ", 8);

-	_TIFFmemset((tdata_t)buffer, 0x00, 16);

 	if(tile==0){

-		buflen=sprintf(buffer, "%lu", (unsigned long)t2p->tiff_width);

+		buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->tiff_width);

 	} else {

 		if(t2p_tile_is_right_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)!=0){

-			buflen=sprintf(

-				buffer, 

-				"%lu", 

+			buflen=snprintf(buffer, sizeof(buffer), "%lu",

 				(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilewidth);

 		} else {

-			buflen=sprintf(

-				buffer, 

-				"%lu", 

+			buflen=snprintf(buffer, sizeof(buffer), "%lu",

 				(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth);

 		}

 	}

 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 	written += t2pWriteFile(output, (tdata_t) "\n/Height ", 9);

-	_TIFFmemset((tdata_t)buffer, 0x00, 16);

 	if(tile==0){

-		buflen=sprintf(buffer, "%lu", (unsigned long)t2p->tiff_length);

+		buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->tiff_length);

 	} else {

 		if(t2p_tile_is_bottom_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)!=0){

-			buflen=sprintf(

-				buffer, 

-				"%lu", 

+			buflen=snprintf(buffer, sizeof(buffer), "%lu",

 				(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilelength);

 		} else {

-			buflen=sprintf(

-				buffer, 

-				"%lu", 

+			buflen=snprintf(buffer, sizeof(buffer), "%lu",

 				(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength);

 		}

 	}

 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 	written += t2pWriteFile(output, (tdata_t) "\n/BitsPerComponent ", 19);

-	_TIFFmemset((tdata_t)buffer, 0x00, 16);

-	buflen=sprintf(buffer, "%u", t2p->tiff_bitspersample);

+	buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->tiff_bitspersample);

 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 	written += t2pWriteFile(output, (tdata_t) "\n/ColorSpace ", 13);

 	written += t2p_write_pdf_xobject_cs(t2p, output);

@@ -4764,7 +4747,7 @@

 tsize_t t2p_write_pdf_xobject_cs(T2P* t2p, TIFF* output){

 	tsize_t written=0;

-	char buffer[128];

+	char buffer[256];

 	int buflen=0;

 	float X_W=1.0;

@@ -4780,11 +4763,10 @@

 		t2p->pdf_colorspace ^= T2P_CS_PALETTE;

 		written += t2p_write_pdf_xobject_cs(t2p, output);

 		t2p->pdf_colorspace |= T2P_CS_PALETTE;

-		buflen=sprintf(buffer, "%u", (0x0001 << t2p->tiff_bitspersample)-1 );

+		buflen=snprintf(buffer, sizeof(buffer), "%u", (0x0001 << t2p->tiff_bitspersample)-1 );

 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 		written += t2pWriteFile(output, (tdata_t) " ", 1);

-		_TIFFmemset(buffer, 0x00, 16);

-		buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_palettecs ); 

+		buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_palettecs ); 

 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 		written += t2pWriteFile(output, (tdata_t) " 0 R ]\n", 7);

 		return(written);

@@ -4818,7 +4800,7 @@

 			X_W /= Y_W;

 			Z_W /= Y_W;

 			Y_W = 1.0F;

-			buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W);

+			buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W);

 			written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 			X_W = 0.3457F; /* 0.3127F; */ /* D50, commented D65 */

 			Y_W = 0.3585F; /* 0.3290F; */

@@ -4826,10 +4808,10 @@

 			X_W /= Y_W;

 			Z_W /= Y_W;

 			Y_W = 1.0F;

-			buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W);

+			buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W);

 			written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 			written += t2pWriteFile(output, (tdata_t) "/Range ", 7);

-			buflen=sprintf(buffer, "[%d %d %d %d] \n", 

+			buflen=snprintf(buffer, sizeof(buffer), "[%d %d %d %d] \n", 

 				t2p->pdf_labrange[0], 

 				t2p->pdf_labrange[1], 

 				t2p->pdf_labrange[2], 

@@ -4845,26 +4827,26 @@

 tsize_t t2p_write_pdf_transfer(T2P* t2p, TIFF* output){

 	tsize_t written=0;

-	char buffer[16];

+	char buffer[32];

 	int buflen=0;

 	written += t2pWriteFile(output, (tdata_t) "<< /Type /ExtGState \n/TR ", 25);

 	if(t2p->tiff_transferfunctioncount == 1){

-		buflen=sprintf(buffer, "%lu",

+		buflen=snprintf(buffer, sizeof(buffer), "%lu",

 			       (unsigned long)(t2p->pdf_xrefcount + 1));

 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 		written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);

 	} else {

 		written += t2pWriteFile(output, (tdata_t) "[ ", 2);

-		buflen=sprintf(buffer, "%lu",

+		buflen=snprintf(buffer, sizeof(buffer), "%lu",

 			       (unsigned long)(t2p->pdf_xrefcount + 1));

 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 		written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);

-		buflen=sprintf(buffer, "%lu",

+		buflen=snprintf(buffer, sizeof(buffer), "%lu",

 			       (unsigned long)(t2p->pdf_xrefcount + 2));

 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 		written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);

-		buflen=sprintf(buffer, "%lu",

+		buflen=snprintf(buffer, sizeof(buffer), "%lu",

 			       (unsigned long)(t2p->pdf_xrefcount + 3));

 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 		written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);

@@ -4886,7 +4868,7 @@

 	written += t2pWriteFile(output, (tdata_t) "/FunctionType 0 \n", 17);

 	written += t2pWriteFile(output, (tdata_t) "/Domain [0.0 1.0] \n", 19);

 	written += t2pWriteFile(output, (tdata_t) "/Range [0.0 1.0] \n", 18);

-	buflen=sprintf(buffer, "/Size [%u] \n", (1<<t2p->tiff_bitspersample));

+	buflen=snprintf(buffer, sizeof(buffer), "/Size [%u] \n", (1<<t2p->tiff_bitspersample));

 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 	written += t2pWriteFile(output, (tdata_t) "/BitsPerSample 16 \n", 19);

 	written += t2p_write_pdf_stream_dict(1<<(t2p->tiff_bitspersample+1), 0, output);

@@ -4913,7 +4895,7 @@

 tsize_t t2p_write_pdf_xobject_calcs(T2P* t2p, TIFF* output){

 	tsize_t written=0;

-	char buffer[128];

+	char buffer[256];

 	int buflen=0;

 	float X_W=0.0;

@@ -4981,16 +4963,16 @@

 	written += t2pWriteFile(output, (tdata_t) "<< \n", 4);

 	if(t2p->pdf_colorspace & T2P_CS_CALGRAY){

 		written += t2pWriteFile(output, (tdata_t) "/WhitePoint ", 12);

-		buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W);

+		buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W);

 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 		written += t2pWriteFile(output, (tdata_t) "/Gamma 2.2 \n", 12);

 	}

 	if(t2p->pdf_colorspace & T2P_CS_CALRGB){

 		written += t2pWriteFile(output, (tdata_t) "/WhitePoint ", 12);

-		buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W);

+		buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W);

 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 		written += t2pWriteFile(output, (tdata_t) "/Matrix ", 8);

-		buflen=sprintf(buffer, "[%.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f] \n", 

+		buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f] \n", 

 			X_R, Y_R, Z_R, 

 			X_G, Y_G, Z_G, 

 			X_B, Y_B, Z_B); 

@@ -5009,11 +4991,11 @@

 tsize_t t2p_write_pdf_xobject_icccs(T2P* t2p, TIFF* output){

 	tsize_t written=0;

-	char buffer[16];

+	char buffer[32];

 	int buflen=0;

 	written += t2pWriteFile(output, (tdata_t) "[/ICCBased ", 11);

-	buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_icccs);

+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_icccs);

 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 	written += t2pWriteFile(output, (tdata_t) " 0 R] \n", 7);

@@ -5023,11 +5005,11 @@

 tsize_t t2p_write_pdf_xobject_icccs_dict(T2P* t2p, TIFF* output){

 	tsize_t written=0;

-	char buffer[16];

+	char buffer[32];

 	int buflen=0;

 	written += t2pWriteFile(output, (tdata_t) "/N ", 3);

-	buflen=sprintf(buffer, "%u \n", t2p->tiff_samplesperpixel);

+	buflen=snprintf(buffer, sizeof(buffer), "%u \n", t2p->tiff_samplesperpixel);

 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 	written += t2pWriteFile(output, (tdata_t) "/Alternate ", 11);

 	t2p->pdf_colorspace ^= T2P_CS_ICCBASED;

@@ -5092,7 +5074,7 @@

 tsize_t t2p_write_pdf_xobject_stream_filter(ttile_t tile, T2P* t2p, TIFF* output){

 	tsize_t written=0;

-	char buffer[16];

+	char buffer[32];

 	int buflen=0;

 	if(t2p->pdf_compression==T2P_COMPRESS_NONE){

@@ -5107,41 +5089,33 @@

 			written += t2pWriteFile(output, (tdata_t) "<< /K -1 ", 9);

 			if(tile==0){

 				written += t2pWriteFile(output, (tdata_t) "/Columns ", 9);

-				buflen=sprintf(buffer, "%lu",

+				buflen=snprintf(buffer, sizeof(buffer), "%lu",

 					       (unsigned long)t2p->tiff_width);

 				written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 				written += t2pWriteFile(output, (tdata_t) " /Rows ", 7);

-				buflen=sprintf(buffer, "%lu",

+				buflen=snprintf(buffer, sizeof(buffer), "%lu",

 					       (unsigned long)t2p->tiff_length);

 				written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 			} else {

 				if(t2p_tile_is_right_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)==0){

 					written += t2pWriteFile(output, (tdata_t) "/Columns ", 9);

-					buflen=sprintf(

-						buffer, 

-						"%lu", 

+					buflen=snprintf(buffer, sizeof(buffer), "%lu",

 						(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth);

 					written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 				} else {

 					written += t2pWriteFile(output, (tdata_t) "/Columns ", 9);

-					buflen=sprintf(

-						buffer, 

-						"%lu", 

+					buflen=snprintf(buffer, sizeof(buffer), "%lu",

 						(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilewidth);

 					written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 				}

 				if(t2p_tile_is_bottom_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)==0){

 					written += t2pWriteFile(output, (tdata_t) " /Rows ", 7);

-					buflen=sprintf(

-						buffer, 

-						"%lu", 

+					buflen=snprintf(buffer, sizeof(buffer), "%lu",

 						(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength);

 					written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 				} else {

 					written += t2pWriteFile(output, (tdata_t) " /Rows ", 7);

-					buflen=sprintf(

-						buffer, 

-						"%lu", 

+					buflen=snprintf(buffer, sizeof(buffer), "%lu",

 						(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilelength);

 					written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 				}

@@ -5168,21 +5142,17 @@

 			if(t2p->pdf_compressionquality%100){

 				written += t2pWriteFile(output, (tdata_t) "/DecodeParms ", 13);

 				written += t2pWriteFile(output, (tdata_t) "<< /Predictor ", 14);

-				_TIFFmemset(buffer, 0x00, 16);

-				buflen=sprintf(buffer, "%u", t2p->pdf_compressionquality%100);

+				buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_compressionquality%100);

 				written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 				written += t2pWriteFile(output, (tdata_t) " /Columns ", 10);

-				_TIFFmemset(buffer, 0x00, 16);

-				buflen = sprintf(buffer, "%lu",

+				buflen = snprintf(buffer, sizeof(buffer), "%lu",

 						 (unsigned long)t2p->tiff_width);

 				written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 				written += t2pWriteFile(output, (tdata_t) " /Colors ", 9);

-				_TIFFmemset(buffer, 0x00, 16);

-				buflen=sprintf(buffer, "%u", t2p->tiff_samplesperpixel);

+				buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->tiff_samplesperpixel);

 				written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 				written += t2pWriteFile(output, (tdata_t) " /BitsPerComponent ", 19);

-				_TIFFmemset(buffer, 0x00, 16);

-				buflen=sprintf(buffer, "%u", t2p->tiff_bitspersample);

+				buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->tiff_bitspersample);

 				written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 				written += t2pWriteFile(output, (tdata_t) ">>\n", 3);

 			}

@@ -5202,16 +5172,16 @@

 tsize_t t2p_write_pdf_xreftable(T2P* t2p, TIFF* output){

 	tsize_t written=0;

-	char buffer[21];

+	char buffer[64];

 	int buflen=0;

 	uint32 i=0;

 	written += t2pWriteFile(output, (tdata_t) "xref\n0 ", 7);

-	buflen=sprintf(buffer, "%lu", (unsigned long)(t2p->pdf_xrefcount + 1));

+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(t2p->pdf_xrefcount + 1));

 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);

 	written += t2pWriteFile(output, (tdata_t) " \n0000000000 65535 f \n", 22);

 	for (i=0;i<t2p->pdf_xrefcount;i++){

-		sprintf(buffer, "%.10lu 00000 n \n",

+		snprintf(buffer, sizeof(buffer), "%.10lu 00000 n \n",

 			(unsigned long)t2p->pdf_xrefoffsets[i]);

 		written += t2pWriteFile(output, (tdata_t) buffer, 20);

 	}

@@ -5251,25 +5221,21 @@

 			"%.2hhX", fileidbuf[i]);

 	}

 	written += t2pWriteFile(output, (tdata_t) "trailer\n<<\n/Size ", 17);

-	buflen = sprintf(buffer, "%lu", (unsigned long)(t2p->pdf_xrefcount+1));

+	buflen = snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(t2p->pdf_xrefcount+1));

 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);

-	_TIFFmemset(buffer, 0x00, 32);	

 	written += t2pWriteFile(output, (tdata_t) "\n/Root ", 7);

-	buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_catalog);

+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_catalog);

 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);

-	_TIFFmemset(buffer, 0x00, 32);	

 	written += t2pWriteFile(output, (tdata_t) " 0 R \n/Info ", 12);

-	buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_info);

+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_info);

 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);

-	_TIFFmemset(buffer, 0x00, 32);	

 	written += t2pWriteFile(output, (tdata_t) " 0 R \n/ID[<", 11);

 	written += t2pWriteFile(output, (tdata_t) t2p->pdf_fileid, 32);

 	written += t2pWriteFile(output, (tdata_t) "><", 2);

 	written += t2pWriteFile(output, (tdata_t) t2p->pdf_fileid, 32);

 	written += t2pWriteFile(output, (tdata_t) ">]\n>>\nstartxref\n", 16);

-	buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_startxref);

+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_startxref);

 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);

-	_TIFFmemset(buffer, 0x00, 32);	

 	written += t2pWriteFile(output, (tdata_t) "\n%%EOF\n", 7);

 	return(written);

diff -Naur tiff-3.9.4.orig/tools/tiff2ps.c tiff-3.9.4/tools/tiff2ps.c

--- tiff-3.9.4.orig/tools/tiff2ps.c	2010-06-10 18:51:29.000000000 -0400

+++ tiff-3.9.4/tools/tiff2ps.c	2013-04-16 12:52:23.884252045 -0400

@@ -1079,8 +1079,8 @@