Blame SOURCES/libtiff-CVE-2013-1961.patch

6456d8
diff -Naur tiff-3.9.4.orig/contrib/dbs/xtiff/xtiff.c tiff-3.9.4/contrib/dbs/xtiff/xtiff.c
6456d8
--- tiff-3.9.4.orig/contrib/dbs/xtiff/xtiff.c	2010-06-08 14:50:40.000000000 -0400
6456d8
+++ tiff-3.9.4/contrib/dbs/xtiff/xtiff.c	2013-04-16 12:52:23.876253257 -0400
6456d8
@@ -512,9 +512,9 @@
6456d8
     Arg args[1];
6456d8
 
6456d8
     if (tfMultiPage)
6456d8
-        sprintf(buffer, "%s - page %d", fileName, tfDirectory);
6456d8
+        snprintf(buffer, sizeof(buffer), "%s - page %d", fileName, tfDirectory);
6456d8
     else
6456d8
-        strcpy(buffer, fileName);
6456d8
+        snprintf(buffer, sizeof(buffer), "%s", fileName);
6456d8
     XtSetArg(args[0], XtNlabel, buffer);
6456d8
     XtSetValues(labelWidget, args, 1);
6456d8
 }
6456d8
diff -Naur tiff-3.9.4.orig/libtiff/tif_codec.c tiff-3.9.4/libtiff/tif_codec.c
6456d8
--- tiff-3.9.4.orig/libtiff/tif_codec.c	2010-06-08 14:50:41.000000000 -0400
6456d8
+++ tiff-3.9.4/libtiff/tif_codec.c	2013-04-16 12:52:23.876253257 -0400
6456d8
@@ -104,7 +104,8 @@
6456d8
 	const TIFFCodec* c = TIFFFindCODEC(tif->tif_dir.td_compression);
6456d8
         char compression_code[20];
6456d8
         
6456d8
-        sprintf( compression_code, "%d", tif->tif_dir.td_compression );
6456d8
+        snprintf(compression_code, sizeof(compression_code), "%d",
6456d8
+		 tif->tif_dir.td_compression );
6456d8
 	TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
6456d8
                      "%s compression support is not configured", 
6456d8
                      c ? c->name : compression_code );
6456d8
diff -Naur tiff-3.9.4.orig/libtiff/tif_dirinfo.c tiff-3.9.4/libtiff/tif_dirinfo.c
6456d8
--- tiff-3.9.4.orig/libtiff/tif_dirinfo.c	2010-06-09 17:15:27.000000000 -0400
6456d8
+++ tiff-3.9.4/libtiff/tif_dirinfo.c	2013-04-16 12:52:23.877253102 -0400
6456d8
@@ -873,7 +873,7 @@
6456d8
 	 * note that this name is a special sign to TIFFClose() and
6456d8
 	 * _TIFFSetupFieldInfo() to free the field
6456d8
 	 */
6456d8
-	sprintf(fld->field_name, "Tag %d", (int) tag);
6456d8
+	snprintf(fld->field_name, 32, "Tag %d", (int) tag);
6456d8
 
6456d8
 	return fld;    
6456d8
 }
6456d8
diff -Naur tiff-3.9.4.orig/tools/rgb2ycbcr.c tiff-3.9.4/tools/rgb2ycbcr.c
6456d8
--- tiff-3.9.4.orig/tools/rgb2ycbcr.c	2010-06-08 14:50:44.000000000 -0400
6456d8
+++ tiff-3.9.4/tools/rgb2ycbcr.c	2013-04-16 12:52:23.878252947 -0400
6456d8
@@ -326,7 +326,8 @@
6456d8
 	TIFFSetField(out, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
6456d8
 	{ char buf[2048];
6456d8
 	  char *cp = strrchr(TIFFFileName(in), '/');
6456d8
-	  sprintf(buf, "YCbCr conversion of %s", cp ? cp+1 : TIFFFileName(in));
6456d8
+	  snprintf(buf, sizeof(buf), "YCbCr conversion of %s",
6456d8
+		   cp ? cp+1 : TIFFFileName(in));
6456d8
 	  TIFFSetField(out, TIFFTAG_IMAGEDESCRIPTION, buf);
6456d8
 	}
6456d8
 	TIFFSetField(out, TIFFTAG_SOFTWARE, TIFFGetVersion());
6456d8
diff -Naur tiff-3.9.4.orig/tools/tiff2bw.c tiff-3.9.4/tools/tiff2bw.c
6456d8
--- tiff-3.9.4.orig/tools/tiff2bw.c	2010-06-08 14:50:44.000000000 -0400
6456d8
+++ tiff-3.9.4/tools/tiff2bw.c	2013-04-16 12:52:23.879252793 -0400
6456d8
@@ -201,7 +201,7 @@
6456d8
 		}
6456d8
 	}
6456d8
 	TIFFSetField(out, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK);
6456d8
-	sprintf(thing, "B&W version of %s", argv[optind]);
6456d8
+	snprintf(thing, sizeof(thing), "B&W version of %s", argv[optind]);
6456d8
 	TIFFSetField(out, TIFFTAG_IMAGEDESCRIPTION, thing);
6456d8
 	TIFFSetField(out, TIFFTAG_SOFTWARE, "tiff2bw");
6456d8
 	outbuf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(out));
6456d8
diff -Naur tiff-3.9.4.orig/tools/tiff2pdf.c tiff-3.9.4/tools/tiff2pdf.c
6456d8
--- tiff-3.9.4.orig/tools/tiff2pdf.c	2013-04-16 12:51:14.647783499 -0400
6456d8
+++ tiff-3.9.4/tools/tiff2pdf.c	2013-04-16 12:56:34.501865141 -0400
6456d8
@@ -3662,7 +3662,9 @@
6456d8
 	char buffer[16];
6456d8
 	int buflen=0;
6456d8
 	
6456d8
-	buflen=sprintf(buffer, "%%PDF-%u.%u ", t2p->pdf_majorversion&0xff, t2p->pdf_minorversion&0xff);
6456d8
+	buflen = snprintf(buffer, sizeof(buffer), "%%PDF-%u.%u ",
6456d8
+			  t2p->pdf_majorversion&0xff,
6456d8
+			  t2p->pdf_minorversion&0xff);
6456d8
 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 	written += t2pWriteFile(output, (tdata_t)"\n%\342\343\317\323\n", 7);
6456d8
 
6456d8
@@ -3676,10 +3678,10 @@
6456d8
 tsize_t t2p_write_pdf_obj_start(uint32 number, TIFF* output){
6456d8
 
6456d8
 	tsize_t written=0;
6456d8
-	char buffer[16];
6456d8
+	char buffer[32];
6456d8
 	int buflen=0;
6456d8
 
6456d8
-	buflen=sprintf(buffer, "%lu", (unsigned long)number);
6456d8
+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)number);
6456d8
 	written += t2pWriteFile(output, (tdata_t) buffer, buflen );
6456d8
 	written += t2pWriteFile(output, (tdata_t) " 0 obj\n", 7);
6456d8
 
6456d8
@@ -3718,13 +3720,13 @@
6456d8
 	written += t2pWriteFile(output, (tdata_t) "/", 1);
6456d8
 	for (i=0;i
6456d8
 		if ( ((unsigned char)name[i]) < 0x21){
6456d8
-			sprintf(buffer, "#%.2X", name[i]);
6456d8
+			snprintf(buffer, sizeof(buffer), "#%.2X", name[i]);
6456d8
 			buffer[sizeof(buffer) - 1] = '\0';
6456d8
 			written += t2pWriteFile(output, (tdata_t) buffer, 3);
6456d8
 			nextchar=1;
6456d8
 		}
6456d8
 		if ( ((unsigned char)name[i]) > 0x7E){
6456d8
-			sprintf(buffer, "#%.2X", name[i]);
6456d8
+			snprintf(buffer, sizeof(buffer), "#%.2X", name[i]);
6456d8
 			buffer[sizeof(buffer) - 1] = '\0';
6456d8
 			written += t2pWriteFile(output, (tdata_t) buffer, 3);
6456d8
 			nextchar=1;
6456d8
@@ -3732,57 +3734,57 @@
6456d8
 		if (nextchar==0){
6456d8
 			switch (name[i]){
6456d8
 				case 0x23:
6456d8
-					sprintf(buffer, "#%.2X", name[i]);
6456d8
+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]);
6456d8
 					buffer[sizeof(buffer) - 1] = '\0';
6456d8
 					written += t2pWriteFile(output, (tdata_t) buffer, 3);
6456d8
 					break;
6456d8
 				case 0x25:
6456d8
-					sprintf(buffer, "#%.2X", name[i]);
6456d8
+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]);
6456d8
 					buffer[sizeof(buffer) - 1] = '\0';
6456d8
 					written += t2pWriteFile(output, (tdata_t) buffer, 3);
6456d8
 					break;
6456d8
 				case 0x28:
6456d8
-					sprintf(buffer, "#%.2X", name[i]);
6456d8
+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]);
6456d8
 					buffer[sizeof(buffer) - 1] = '\0';
6456d8
 					written += t2pWriteFile(output, (tdata_t) buffer, 3);
6456d8
 					break;
6456d8
 				case 0x29:
6456d8
-					sprintf(buffer, "#%.2X", name[i]); 
6456d8
+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); 
6456d8
 					buffer[sizeof(buffer) - 1] = '\0';
6456d8
 					written += t2pWriteFile(output, (tdata_t) buffer, 3);
6456d8
 					break;
6456d8
 				case 0x2F:
6456d8
-					sprintf(buffer, "#%.2X", name[i]); 
6456d8
+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); 
6456d8
 					buffer[sizeof(buffer) - 1] = '\0';
6456d8
 					written += t2pWriteFile(output, (tdata_t) buffer, 3);
6456d8
 					break;
6456d8
 				case 0x3C:
6456d8
-					sprintf(buffer, "#%.2X", name[i]); 
6456d8
+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); 
6456d8
 					buffer[sizeof(buffer) - 1] = '\0';
6456d8
 					written += t2pWriteFile(output, (tdata_t) buffer, 3);
6456d8
 					break;
6456d8
 				case 0x3E:
6456d8
-					sprintf(buffer, "#%.2X", name[i]);
6456d8
+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]);
6456d8
 					buffer[sizeof(buffer) - 1] = '\0';
6456d8
 					written += t2pWriteFile(output, (tdata_t) buffer, 3);
6456d8
 					break;
6456d8
 				case 0x5B:
6456d8
-					sprintf(buffer, "#%.2X", name[i]); 
6456d8
+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); 
6456d8
 					buffer[sizeof(buffer) - 1] = '\0';
6456d8
 					written += t2pWriteFile(output, (tdata_t) buffer, 3);
6456d8
 					break;
6456d8
 				case 0x5D:
6456d8
-					sprintf(buffer, "#%.2X", name[i]);
6456d8
+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]);
6456d8
 					buffer[sizeof(buffer) - 1] = '\0';
6456d8
 					written += t2pWriteFile(output, (tdata_t) buffer, 3);
6456d8
 					break;
6456d8
 				case 0x7B:
6456d8
-					sprintf(buffer, "#%.2X", name[i]); 
6456d8
+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); 
6456d8
 					buffer[sizeof(buffer) - 1] = '\0';
6456d8
 					written += t2pWriteFile(output, (tdata_t) buffer, 3);
6456d8
 					break;
6456d8
 				case 0x7D:
6456d8
-					sprintf(buffer, "#%.2X", name[i]); 
6456d8
+					snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); 
6456d8
 					buffer[sizeof(buffer) - 1] = '\0';
6456d8
 					written += t2pWriteFile(output, (tdata_t) buffer, 3);
6456d8
 					break;
6456d8
@@ -3812,7 +3814,7 @@
6456d8
 	written += t2pWriteFile(output, (tdata_t) "(", 1);
6456d8
 	for (i=0; i
6456d8
 		if((pdfstr[i]&0x80) || (pdfstr[i]==127) || (pdfstr[i]<32)){
6456d8
-			sprintf(buffer, "\\%.3hho", pdfstr[i]);
6456d8
+			snprintf(buffer, sizeof(buffer), "\\%.3hho", pdfstr[i]);
6456d8
 			buffer[sizeof(buffer) - 1] = '\0';
6456d8
 			written += t2pWriteFile(output, (tdata_t) buffer, 4);
6456d8
 		} else {
6456d8
@@ -3898,14 +3900,14 @@
6456d8
 tsize_t t2p_write_pdf_stream_dict(tsize_t len, uint32 number, TIFF* output){
6456d8
 	
6456d8
 	tsize_t written=0;
6456d8
-	char buffer[16];
6456d8
+	char buffer[32];
6456d8
 	int buflen=0;
6456d8
 	
6456d8
 	written += t2pWriteFile(output, (tdata_t) "/Length ", 8);
6456d8
 	if(len!=0){
6456d8
 		written += t2p_write_pdf_stream_length(len, output);
6456d8
 	} else {
6456d8
-		buflen=sprintf(buffer, "%lu", (unsigned long)number);
6456d8
+		buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)number);
6456d8
 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 		written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6);
6456d8
 	}
6456d8
@@ -3946,10 +3948,10 @@
6456d8
 tsize_t t2p_write_pdf_stream_length(tsize_t len, TIFF* output){
6456d8
 
6456d8
 	tsize_t written=0;
6456d8
-	char buffer[16];
6456d8
+	char buffer[32];
6456d8
 	int buflen=0;
6456d8
 
6456d8
-	buflen=sprintf(buffer, "%lu", (unsigned long)len);
6456d8
+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)len);
6456d8
 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 	written += t2pWriteFile(output, (tdata_t) "\n", 1);
6456d8
 
6456d8
@@ -3963,13 +3965,13 @@
6456d8
 tsize_t t2p_write_pdf_catalog(T2P* t2p, TIFF* output){
6456d8
 
6456d8
 	tsize_t written=0;
6456d8
-	char buffer[16];
6456d8
+	char buffer[32];
6456d8
 	int buflen=0;
6456d8
 
6456d8
 	written += t2pWriteFile(output, 
6456d8
 		(tdata_t)"<< \n/Type /Catalog \n/Pages ", 
6456d8
 		27);
6456d8
-	buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_pages);
6456d8
+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_pages);
6456d8
 	written += t2pWriteFile(output, (tdata_t) buffer, buflen );
6456d8
 	written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6);
6456d8
 	if(t2p->pdf_fitwindow){
6456d8
@@ -4003,8 +4005,7 @@
6456d8
 		written += t2p_write_pdf_string(t2p->pdf_datetime, output);
6456d8
 	}
6456d8
 	written += t2pWriteFile(output, (tdata_t) "\n/Producer ", 11);
6456d8
-	_TIFFmemset((tdata_t)buffer, 0x00, sizeof(buffer));
6456d8
-	buflen = sprintf(buffer, "libtiff / tiff2pdf - %d", TIFFLIB_VERSION);
6456d8
+	buflen = snprintf(buffer, sizeof(buffer), "libtiff / tiff2pdf - %d", TIFFLIB_VERSION);
6456d8
 	written += t2p_write_pdf_string((unsigned char*)buffer, output);
6456d8
 	written += t2pWriteFile(output, (tdata_t) "\n", 1);
6456d8
 	if(t2p->pdf_creator != NULL){ 
6456d8
@@ -4179,7 +4180,7 @@
6456d8
 {
6456d8
 	tsize_t written=0;
6456d8
 	tdir_t i=0;
6456d8
-	char buffer[16];
6456d8
+	char buffer[32];
6456d8
 	int buflen=0;
6456d8
 
6456d8
 	int page=0;
6456d8
@@ -4187,7 +4188,7 @@
6456d8
 		(tdata_t) "<< \n/Type /Pages \n/Kids [ ", 26);
6456d8
 	page = t2p->pdf_pages+1;
6456d8
 	for (i=0;i<t2p->tiff_pagecount;i++){
6456d8
-		buflen=sprintf(buffer, "%d", page);
6456d8
+		buflen=snprintf(buffer, sizeof(buffer), "%d", page);
6456d8
 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 		written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);
6456d8
 		if ( ((i+1)%8)==0 ) {
6456d8
@@ -4202,8 +4203,7 @@
6456d8
 		}
6456d8
 	}
6456d8
 	written += t2pWriteFile(output, (tdata_t) "] \n/Count ", 10);
6456d8
-	_TIFFmemset(buffer, 0x00, 16);
6456d8
-	buflen=sprintf(buffer, "%d", t2p->tiff_pagecount);
6456d8
+	buflen=snprintf(buffer, sizeof(buffer), "%d", t2p->tiff_pagecount);
6456d8
 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 	written += t2pWriteFile(output, (tdata_t) " \n>> \n", 6);
6456d8
 
6456d8
@@ -4218,28 +4218,28 @@
6456d8
 
6456d8
 	unsigned int i=0;
6456d8
 	tsize_t written=0;
6456d8
-	char buffer[16];
6456d8
+	char buffer[256];
6456d8
 	int buflen=0;
6456d8
 	
6456d8
 	written += t2pWriteFile(output, (tdata_t) "<<\n/Type /Page \n/Parent ", 24);
6456d8
-	buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_pages);
6456d8
+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_pages);
6456d8
 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 	written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6);
6456d8
 	written += t2pWriteFile(output, (tdata_t) "/MediaBox [", 11); 
6456d8
-	buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.x1);
6456d8
+	buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.x1);
6456d8
 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 	written += t2pWriteFile(output, (tdata_t) " ", 1); 
6456d8
-	buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.y1);
6456d8
+	buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.y1);
6456d8
 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 	written += t2pWriteFile(output, (tdata_t) " ", 1); 
6456d8
-	buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.x2);
6456d8
+	buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.x2);
6456d8
 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 	written += t2pWriteFile(output, (tdata_t) " ", 1); 
6456d8
-	buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.y2);
6456d8
+	buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.y2);
6456d8
 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 	written += t2pWriteFile(output, (tdata_t) "] \n", 3); 
6456d8
 	written += t2pWriteFile(output, (tdata_t) "/Contents ", 10);
6456d8
-	buflen=sprintf(buffer, "%lu", (unsigned long)(object + 1));
6456d8
+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(object + 1));
6456d8
 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 	written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6);
6456d8
 	written += t2pWriteFile(output, (tdata_t) "/Resources << \n", 15);
6456d8
@@ -4247,15 +4247,13 @@
6456d8
 		written += t2pWriteFile(output, (tdata_t) "/XObject <<\n", 12);
6456d8
 		for(i=0;i<t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount;i++){
6456d8
 			written += t2pWriteFile(output, (tdata_t) "/Im", 3);
6456d8
-			buflen = sprintf(buffer, "%u", t2p->pdf_page+1);
6456d8
+			buflen = snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1);
6456d8
 			written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 			written += t2pWriteFile(output, (tdata_t) "_", 1);
6456d8
-			buflen = sprintf(buffer, "%u", i+1);
6456d8
+			buflen = snprintf(buffer, sizeof(buffer), "%u", i+1);
6456d8
 			written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 			written += t2pWriteFile(output, (tdata_t) " ", 1);
6456d8
-			buflen = sprintf(
6456d8
-				buffer, 
6456d8
-				"%lu", 
6456d8
+			buflen = snprintf(buffer, sizeof(buffer), "%lu",
6456d8
 				(unsigned long)(object+3+(2*i)+t2p->tiff_pages[t2p->pdf_page].page_extra)); 
6456d8
 			written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 			written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);
6456d8
@@ -4267,12 +4265,10 @@
6456d8
 	} else {
6456d8
 			written += t2pWriteFile(output, (tdata_t) "/XObject <<\n", 12);
6456d8
 			written += t2pWriteFile(output, (tdata_t) "/Im", 3);
6456d8
-			buflen = sprintf(buffer, "%u", t2p->pdf_page+1);
6456d8
+			buflen = snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1);
6456d8
 			written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 			written += t2pWriteFile(output, (tdata_t) " ", 1);
6456d8
-			buflen = sprintf(
6456d8
-				buffer, 
6456d8
-				"%lu", 
6456d8
+			buflen = snprintf(buffer, sizeof(buffer), "%lu",
6456d8
 				(unsigned long)(object+3+(2*i)+t2p->tiff_pages[t2p->pdf_page].page_extra)); 
6456d8
 			written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 			written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);
6456d8
@@ -4281,9 +4277,7 @@
6456d8
 	if(t2p->tiff_transferfunctioncount != 0) {
6456d8
 		written += t2pWriteFile(output, (tdata_t) "/ExtGState <<", 13);
6456d8
 		t2pWriteFile(output, (tdata_t) "/GS1 ", 5);
6456d8
-		buflen = sprintf(
6456d8
-			buffer, 
6456d8
-			"%lu", 
6456d8
+		buflen = snprintf(buffer, sizeof(buffer), "%lu",
6456d8
 			(unsigned long)(object + 3)); 
6456d8
 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 		written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);
6456d8
@@ -4644,7 +4638,7 @@
6456d8
 	if(t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount>0){ 
6456d8
 		for(i=0;i<t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount; i++){
6456d8
 			box=t2p->tiff_tiles[t2p->pdf_page].tiles_tiles[i].tile_box;
6456d8
-			buflen=sprintf(buffer, 
6456d8
+			buflen=snprintf(buffer, sizeof(buffer), 
6456d8
 				"q %s %.4f %.4f %.4f %.4f %.4f %.4f cm /Im%d_%ld Do Q\n", 
6456d8
 				t2p->tiff_transferfunctioncount?"/GS1 gs ":"",
6456d8
 				box.mat[0],
6456d8
@@ -4659,7 +4653,7 @@
6456d8
 		}
6456d8
 	} else {
6456d8
 		box=t2p->pdf_imagebox;
6456d8
-		buflen=sprintf(buffer, 
6456d8
+		buflen=snprintf(buffer, sizeof(buffer), 
6456d8
 			"q %s %.4f %.4f %.4f %.4f %.4f %.4f cm /Im%d Do Q\n", 
6456d8
 			t2p->tiff_transferfunctioncount?"/GS1 gs ":"",
6456d8
 			box.mat[0],
6456d8
@@ -4684,59 +4678,48 @@
6456d8
 												TIFF* output){
6456d8
 
6456d8
 	tsize_t written=0;
6456d8
-	char buffer[16];
6456d8
+	char buffer[32];
6456d8
 	int buflen=0;
6456d8
 
6456d8
 	written += t2p_write_pdf_stream_dict(0, t2p->pdf_xrefcount+1, output); 
6456d8
 	written += t2pWriteFile(output, 
6456d8
 		(tdata_t) "/Type /XObject \n/Subtype /Image \n/Name /Im", 
6456d8
 		42);
6456d8
-	buflen=sprintf(buffer, "%u", t2p->pdf_page+1);
6456d8
+	buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1);
6456d8
 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 	if(tile != 0){
6456d8
 		written += t2pWriteFile(output, (tdata_t) "_", 1);
6456d8
-		buflen=sprintf(buffer, "%lu", (unsigned long)tile);
6456d8
+		buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)tile);
6456d8
 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 	}
6456d8
 	written += t2pWriteFile(output, (tdata_t) "\n/Width ", 8);
6456d8
-	_TIFFmemset((tdata_t)buffer, 0x00, 16);
6456d8
 	if(tile==0){
6456d8
-		buflen=sprintf(buffer, "%lu", (unsigned long)t2p->tiff_width);
6456d8
+		buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->tiff_width);
6456d8
 	} else {
6456d8
 		if(t2p_tile_is_right_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)!=0){
6456d8
-			buflen=sprintf(
6456d8
-				buffer, 
6456d8
-				"%lu", 
6456d8
+			buflen=snprintf(buffer, sizeof(buffer), "%lu",
6456d8
 				(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilewidth);
6456d8
 		} else {
6456d8
-			buflen=sprintf(
6456d8
-				buffer, 
6456d8
-				"%lu", 
6456d8
+			buflen=snprintf(buffer, sizeof(buffer), "%lu",
6456d8
 				(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth);
6456d8
 		}
6456d8
 	}
6456d8
 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 	written += t2pWriteFile(output, (tdata_t) "\n/Height ", 9);
6456d8
-	_TIFFmemset((tdata_t)buffer, 0x00, 16);
6456d8
 	if(tile==0){
6456d8
-		buflen=sprintf(buffer, "%lu", (unsigned long)t2p->tiff_length);
6456d8
+		buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->tiff_length);
6456d8
 	} else {
6456d8
 		if(t2p_tile_is_bottom_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)!=0){
6456d8
-			buflen=sprintf(
6456d8
-				buffer, 
6456d8
-				"%lu", 
6456d8
+			buflen=snprintf(buffer, sizeof(buffer), "%lu",
6456d8
 				(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilelength);
6456d8
 		} else {
6456d8
-			buflen=sprintf(
6456d8
-				buffer, 
6456d8
-				"%lu", 
6456d8
+			buflen=snprintf(buffer, sizeof(buffer), "%lu",
6456d8
 				(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength);
6456d8
 		}
6456d8
 	}
6456d8
 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 	written += t2pWriteFile(output, (tdata_t) "\n/BitsPerComponent ", 19);
6456d8
-	_TIFFmemset((tdata_t)buffer, 0x00, 16);
6456d8
-	buflen=sprintf(buffer, "%u", t2p->tiff_bitspersample);
6456d8
+	buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->tiff_bitspersample);
6456d8
 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 	written += t2pWriteFile(output, (tdata_t) "\n/ColorSpace ", 13);
6456d8
 	written += t2p_write_pdf_xobject_cs(t2p, output);
6456d8
@@ -4764,7 +4747,7 @@
6456d8
 tsize_t t2p_write_pdf_xobject_cs(T2P* t2p, TIFF* output){
6456d8
 
6456d8
 	tsize_t written=0;
6456d8
-	char buffer[128];
6456d8
+	char buffer[256];
6456d8
 	int buflen=0;
6456d8
 
6456d8
 	float X_W=1.0;
6456d8
@@ -4780,11 +4763,10 @@
6456d8
 		t2p->pdf_colorspace ^= T2P_CS_PALETTE;
6456d8
 		written += t2p_write_pdf_xobject_cs(t2p, output);
6456d8
 		t2p->pdf_colorspace |= T2P_CS_PALETTE;
6456d8
-		buflen=sprintf(buffer, "%u", (0x0001 << t2p->tiff_bitspersample)-1 );
6456d8
+		buflen=snprintf(buffer, sizeof(buffer), "%u", (0x0001 << t2p->tiff_bitspersample)-1 );
6456d8
 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 		written += t2pWriteFile(output, (tdata_t) " ", 1);
6456d8
-		_TIFFmemset(buffer, 0x00, 16);
6456d8
-		buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_palettecs ); 
6456d8
+		buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_palettecs ); 
6456d8
 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 		written += t2pWriteFile(output, (tdata_t) " 0 R ]\n", 7);
6456d8
 		return(written);
6456d8
@@ -4818,7 +4800,7 @@
6456d8
 			X_W /= Y_W;
6456d8
 			Z_W /= Y_W;
6456d8
 			Y_W = 1.0F;
6456d8
-			buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W);
6456d8
+			buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W);
6456d8
 			written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 			X_W = 0.3457F; /* 0.3127F; */ /* D50, commented D65 */
6456d8
 			Y_W = 0.3585F; /* 0.3290F; */
6456d8
@@ -4826,10 +4808,10 @@
6456d8
 			X_W /= Y_W;
6456d8
 			Z_W /= Y_W;
6456d8
 			Y_W = 1.0F;
6456d8
-			buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W);
6456d8
+			buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W);
6456d8
 			written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 			written += t2pWriteFile(output, (tdata_t) "/Range ", 7);
6456d8
-			buflen=sprintf(buffer, "[%d %d %d %d] \n", 
6456d8
+			buflen=snprintf(buffer, sizeof(buffer), "[%d %d %d %d] \n", 
6456d8
 				t2p->pdf_labrange[0], 
6456d8
 				t2p->pdf_labrange[1], 
6456d8
 				t2p->pdf_labrange[2], 
6456d8
@@ -4845,26 +4827,26 @@
6456d8
 tsize_t t2p_write_pdf_transfer(T2P* t2p, TIFF* output){
6456d8
 
6456d8
 	tsize_t written=0;
6456d8
-	char buffer[16];
6456d8
+	char buffer[32];
6456d8
 	int buflen=0;
6456d8
 
6456d8
 	written += t2pWriteFile(output, (tdata_t) "<< /Type /ExtGState \n/TR ", 25);
6456d8
 	if(t2p->tiff_transferfunctioncount == 1){
6456d8
-		buflen=sprintf(buffer, "%lu",
6456d8
+		buflen=snprintf(buffer, sizeof(buffer), "%lu",
6456d8
 			       (unsigned long)(t2p->pdf_xrefcount + 1));
6456d8
 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 		written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);
6456d8
 	} else {
6456d8
 		written += t2pWriteFile(output, (tdata_t) "[ ", 2);
6456d8
-		buflen=sprintf(buffer, "%lu",
6456d8
+		buflen=snprintf(buffer, sizeof(buffer), "%lu",
6456d8
 			       (unsigned long)(t2p->pdf_xrefcount + 1));
6456d8
 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 		written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);
6456d8
-		buflen=sprintf(buffer, "%lu",
6456d8
+		buflen=snprintf(buffer, sizeof(buffer), "%lu",
6456d8
 			       (unsigned long)(t2p->pdf_xrefcount + 2));
6456d8
 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 		written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);
6456d8
-		buflen=sprintf(buffer, "%lu",
6456d8
+		buflen=snprintf(buffer, sizeof(buffer), "%lu",
6456d8
 			       (unsigned long)(t2p->pdf_xrefcount + 3));
6456d8
 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 		written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);
6456d8
@@ -4886,7 +4868,7 @@
6456d8
 	written += t2pWriteFile(output, (tdata_t) "/FunctionType 0 \n", 17);
6456d8
 	written += t2pWriteFile(output, (tdata_t) "/Domain [0.0 1.0] \n", 19);
6456d8
 	written += t2pWriteFile(output, (tdata_t) "/Range [0.0 1.0] \n", 18);
6456d8
-	buflen=sprintf(buffer, "/Size [%u] \n", (1<<t2p->tiff_bitspersample));
6456d8
+	buflen=snprintf(buffer, sizeof(buffer), "/Size [%u] \n", (1<<t2p->tiff_bitspersample));
6456d8
 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 	written += t2pWriteFile(output, (tdata_t) "/BitsPerSample 16 \n", 19);
6456d8
 	written += t2p_write_pdf_stream_dict(1<<(t2p->tiff_bitspersample+1), 0, output);
6456d8
@@ -4913,7 +4895,7 @@
6456d8
 tsize_t t2p_write_pdf_xobject_calcs(T2P* t2p, TIFF* output){
6456d8
 
6456d8
 	tsize_t written=0;
6456d8
-	char buffer[128];
6456d8
+	char buffer[256];
6456d8
 	int buflen=0;
6456d8
 	
6456d8
 	float X_W=0.0;
6456d8
@@ -4981,16 +4963,16 @@
6456d8
 	written += t2pWriteFile(output, (tdata_t) "<< \n", 4);
6456d8
 	if(t2p->pdf_colorspace & T2P_CS_CALGRAY){
6456d8
 		written += t2pWriteFile(output, (tdata_t) "/WhitePoint ", 12);
6456d8
-		buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W);
6456d8
+		buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W);
6456d8
 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 		written += t2pWriteFile(output, (tdata_t) "/Gamma 2.2 \n", 12);
6456d8
 	}
6456d8
 	if(t2p->pdf_colorspace & T2P_CS_CALRGB){
6456d8
 		written += t2pWriteFile(output, (tdata_t) "/WhitePoint ", 12);
6456d8
-		buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W);
6456d8
+		buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W);
6456d8
 		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 		written += t2pWriteFile(output, (tdata_t) "/Matrix ", 8);
6456d8
-		buflen=sprintf(buffer, "[%.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f] \n", 
6456d8
+		buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f] \n", 
6456d8
 			X_R, Y_R, Z_R, 
6456d8
 			X_G, Y_G, Z_G, 
6456d8
 			X_B, Y_B, Z_B); 
6456d8
@@ -5009,11 +4991,11 @@
6456d8
 tsize_t t2p_write_pdf_xobject_icccs(T2P* t2p, TIFF* output){
6456d8
 
6456d8
 	tsize_t written=0;
6456d8
-	char buffer[16];
6456d8
+	char buffer[32];
6456d8
 	int buflen=0;
6456d8
 	
6456d8
 	written += t2pWriteFile(output, (tdata_t) "[/ICCBased ", 11);
6456d8
-	buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_icccs);
6456d8
+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_icccs);
6456d8
 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 	written += t2pWriteFile(output, (tdata_t) " 0 R] \n", 7);
6456d8
 
6456d8
@@ -5023,11 +5005,11 @@
6456d8
 tsize_t t2p_write_pdf_xobject_icccs_dict(T2P* t2p, TIFF* output){
6456d8
 
6456d8
 	tsize_t written=0;
6456d8
-	char buffer[16];
6456d8
+	char buffer[32];
6456d8
 	int buflen=0;
6456d8
 	
6456d8
 	written += t2pWriteFile(output, (tdata_t) "/N ", 3);
6456d8
-	buflen=sprintf(buffer, "%u \n", t2p->tiff_samplesperpixel);
6456d8
+	buflen=snprintf(buffer, sizeof(buffer), "%u \n", t2p->tiff_samplesperpixel);
6456d8
 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 	written += t2pWriteFile(output, (tdata_t) "/Alternate ", 11);
6456d8
 	t2p->pdf_colorspace ^= T2P_CS_ICCBASED;
6456d8
@@ -5092,7 +5074,7 @@
6456d8
 tsize_t t2p_write_pdf_xobject_stream_filter(ttile_t tile, T2P* t2p, TIFF* output){
6456d8
 
6456d8
 	tsize_t written=0;
6456d8
-	char buffer[16];
6456d8
+	char buffer[32];
6456d8
 	int buflen=0;
6456d8
 
6456d8
 	if(t2p->pdf_compression==T2P_COMPRESS_NONE){
6456d8
@@ -5107,41 +5089,33 @@
6456d8
 			written += t2pWriteFile(output, (tdata_t) "<< /K -1 ", 9);
6456d8
 			if(tile==0){
6456d8
 				written += t2pWriteFile(output, (tdata_t) "/Columns ", 9);
6456d8
-				buflen=sprintf(buffer, "%lu",
6456d8
+				buflen=snprintf(buffer, sizeof(buffer), "%lu",
6456d8
 					       (unsigned long)t2p->tiff_width);
6456d8
 				written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 				written += t2pWriteFile(output, (tdata_t) " /Rows ", 7);
6456d8
-				buflen=sprintf(buffer, "%lu",
6456d8
+				buflen=snprintf(buffer, sizeof(buffer), "%lu",
6456d8
 					       (unsigned long)t2p->tiff_length);
6456d8
 				written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 			} else {
6456d8
 				if(t2p_tile_is_right_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)==0){
6456d8
 					written += t2pWriteFile(output, (tdata_t) "/Columns ", 9);
6456d8
-					buflen=sprintf(
6456d8
-						buffer, 
6456d8
-						"%lu", 
6456d8
+					buflen=snprintf(buffer, sizeof(buffer), "%lu",
6456d8
 						(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth);
6456d8
 					written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 				} else {
6456d8
 					written += t2pWriteFile(output, (tdata_t) "/Columns ", 9);
6456d8
-					buflen=sprintf(
6456d8
-						buffer, 
6456d8
-						"%lu", 
6456d8
+					buflen=snprintf(buffer, sizeof(buffer), "%lu",
6456d8
 						(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilewidth);
6456d8
 					written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 				}
6456d8
 				if(t2p_tile_is_bottom_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)==0){
6456d8
 					written += t2pWriteFile(output, (tdata_t) " /Rows ", 7);
6456d8
-					buflen=sprintf(
6456d8
-						buffer, 
6456d8
-						"%lu", 
6456d8
+					buflen=snprintf(buffer, sizeof(buffer), "%lu",
6456d8
 						(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength);
6456d8
 					written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 				} else {
6456d8
 					written += t2pWriteFile(output, (tdata_t) " /Rows ", 7);
6456d8
-					buflen=sprintf(
6456d8
-						buffer, 
6456d8
-						"%lu", 
6456d8
+					buflen=snprintf(buffer, sizeof(buffer), "%lu",
6456d8
 						(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilelength);
6456d8
 					written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 				}
6456d8
@@ -5168,21 +5142,17 @@
6456d8
 			if(t2p->pdf_compressionquality%100){
6456d8
 				written += t2pWriteFile(output, (tdata_t) "/DecodeParms ", 13);
6456d8
 				written += t2pWriteFile(output, (tdata_t) "<< /Predictor ", 14);
6456d8
-				_TIFFmemset(buffer, 0x00, 16);
6456d8
-				buflen=sprintf(buffer, "%u", t2p->pdf_compressionquality%100);
6456d8
+				buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_compressionquality%100);
6456d8
 				written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 				written += t2pWriteFile(output, (tdata_t) " /Columns ", 10);
6456d8
-				_TIFFmemset(buffer, 0x00, 16);
6456d8
-				buflen = sprintf(buffer, "%lu",
6456d8
+				buflen = snprintf(buffer, sizeof(buffer), "%lu",
6456d8
 						 (unsigned long)t2p->tiff_width);
6456d8
 				written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 				written += t2pWriteFile(output, (tdata_t) " /Colors ", 9);
6456d8
-				_TIFFmemset(buffer, 0x00, 16);
6456d8
-				buflen=sprintf(buffer, "%u", t2p->tiff_samplesperpixel);
6456d8
+				buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->tiff_samplesperpixel);
6456d8
 				written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 				written += t2pWriteFile(output, (tdata_t) " /BitsPerComponent ", 19);
6456d8
-				_TIFFmemset(buffer, 0x00, 16);
6456d8
-				buflen=sprintf(buffer, "%u", t2p->tiff_bitspersample);
6456d8
+				buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->tiff_bitspersample);
6456d8
 				written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 				written += t2pWriteFile(output, (tdata_t) ">>\n", 3);
6456d8
 			}
6456d8
@@ -5202,16 +5172,16 @@
6456d8
 tsize_t t2p_write_pdf_xreftable(T2P* t2p, TIFF* output){
6456d8
 
6456d8
 	tsize_t written=0;
6456d8
-	char buffer[21];
6456d8
+	char buffer[64];
6456d8
 	int buflen=0;
6456d8
 	uint32 i=0;
6456d8
 
6456d8
 	written += t2pWriteFile(output, (tdata_t) "xref\n0 ", 7);
6456d8
-	buflen=sprintf(buffer, "%lu", (unsigned long)(t2p->pdf_xrefcount + 1));
6456d8
+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(t2p->pdf_xrefcount + 1));
6456d8
 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
 	written += t2pWriteFile(output, (tdata_t) " \n0000000000 65535 f \n", 22);
6456d8
 	for (i=0;i<t2p->pdf_xrefcount;i++){
6456d8
-		sprintf(buffer, "%.10lu 00000 n \n",
6456d8
+		snprintf(buffer, sizeof(buffer), "%.10lu 00000 n \n",
6456d8
 			(unsigned long)t2p->pdf_xrefoffsets[i]);
6456d8
 		written += t2pWriteFile(output, (tdata_t) buffer, 20);
6456d8
 	}
6456d8
@@ -5251,25 +5221,21 @@
6456d8
 			"%.2hhX", fileidbuf[i]);
6456d8
 	}
6456d8
 	written += t2pWriteFile(output, (tdata_t) "trailer\n<<\n/Size ", 17);
6456d8
-	buflen = sprintf(buffer, "%lu", (unsigned long)(t2p->pdf_xrefcount+1));
6456d8
+	buflen = snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(t2p->pdf_xrefcount+1));
6456d8
 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
-	_TIFFmemset(buffer, 0x00, 32);	
6456d8
 	written += t2pWriteFile(output, (tdata_t) "\n/Root ", 7);
6456d8
-	buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_catalog);
6456d8
+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_catalog);
6456d8
 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
-	_TIFFmemset(buffer, 0x00, 32);	
6456d8
 	written += t2pWriteFile(output, (tdata_t) " 0 R \n/Info ", 12);
6456d8
-	buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_info);
6456d8
+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_info);
6456d8
 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
-	_TIFFmemset(buffer, 0x00, 32);	
6456d8
 	written += t2pWriteFile(output, (tdata_t) " 0 R \n/ID[<", 11);
6456d8
 	written += t2pWriteFile(output, (tdata_t) t2p->pdf_fileid, 32);
6456d8
 	written += t2pWriteFile(output, (tdata_t) "><", 2);
6456d8
 	written += t2pWriteFile(output, (tdata_t) t2p->pdf_fileid, 32);
6456d8
 	written += t2pWriteFile(output, (tdata_t) ">]\n>>\nstartxref\n", 16);
6456d8
-	buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_startxref);
6456d8
+	buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_startxref);
6456d8
 	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
6456d8
-	_TIFFmemset(buffer, 0x00, 32);	
6456d8
 	written += t2pWriteFile(output, (tdata_t) "\n%%EOF\n", 7);
6456d8
 
6456d8
 	return(written);
6456d8
diff -Naur tiff-3.9.4.orig/tools/tiff2ps.c tiff-3.9.4/tools/tiff2ps.c
6456d8
--- tiff-3.9.4.orig/tools/tiff2ps.c	2010-06-10 18:51:29.000000000 -0400
6456d8
+++ tiff-3.9.4/tools/tiff2ps.c	2013-04-16 12:52:23.884252045 -0400
6456d8
@@ -1079,8 +1079,8 @@
6456d8
 		imageOp = "imagemask";
6456d8
 
6456d8
 	(void)strcpy(im_x, "0");
6456d8
-	(void)sprintf(im_y, "%lu", (long) h);
6456d8
-	(void)sprintf(im_h, "%lu", (long) h);
6456d8
+	(void)snprintf(im_y, sizeof(im_y), "%lu", (long) h);
6456d8
+	(void)snprintf(im_h, sizeof(im_h), "%lu", (long) h);
6456d8
 	tile_width = w;
6456d8
 	tile_height = h;
6456d8
 	if (TIFFIsTiled(tif)) {
6456d8
@@ -1101,7 +1101,7 @@
6456d8
 		}
6456d8
 		if (tile_height < h) {
6456d8
 			fputs("/im_y 0 def\n", fd);
6456d8
-			(void)sprintf(im_y, "%lu im_y sub", (unsigned long) h);
6456d8
+			(void)snprintf(im_y, sizeof(im_y), "%lu im_y sub", (unsigned long) h);
6456d8
 		}
6456d8
 	} else {
6456d8
 		repeat_count = tf_numberstrips;
6456d8
@@ -1113,7 +1113,7 @@
6456d8
 			fprintf(fd, "/im_h %lu def\n",
6456d8
 			    (unsigned long) tile_height);
6456d8
 			(void)strcpy(im_h, "im_h");
6456d8
-			(void)sprintf(im_y, "%lu im_y sub", (unsigned long) h);
6456d8
+			(void)snprintf(im_y, sizeof(im_y), "%lu im_y sub", (unsigned long) h);
6456d8
 		}
6456d8
 	}
6456d8
 
6456d8
diff -Naur tiff-3.9.4.orig/tools/tiffcrop.c tiff-3.9.4/tools/tiffcrop.c
6456d8
--- tiff-3.9.4.orig/tools/tiffcrop.c	2010-06-11 18:24:23.000000000 -0400
6456d8
+++ tiff-3.9.4/tools/tiffcrop.c	2013-04-16 12:57:52.968382205 -0400
6456d8
@@ -2063,7 +2063,7 @@
6456d8
         strncpy (export_ext, ".tiff", 5);
6456d8
       export_ext[5] = '\0';
6456d8
 
6456d8
-      sprintf (filenum, "-%03d%s", findex, export_ext);
6456d8
+      snprintf(filenum, sizeof(filenum), "-%03d%s", findex, export_ext);
6456d8
       filenum[15] = '\0';
6456d8
       strncat (exportname, filenum, 14);
6456d8
       }
6456d8
@@ -2213,7 +2213,8 @@
6456d8
           if (dump.infile != NULL)
6456d8
             fclose (dump.infile);
6456d8
 
6456d8
-          sprintf (temp_filename, "%s-read-%03d.%s", dump.infilename, dump_images,
6456d8
+          snprintf(temp_filename, sizeof(temp_filename), "%s-read-%03d.%s",
6456d8
+		   dump.infilename, dump_images,
6456d8
                   (dump.format == DUMP_TEXT) ? "txt" : "raw");
6456d8
           if ((dump.infile = fopen(temp_filename, dump.mode)) == NULL)
6456d8
             {
6456d8
@@ -2229,7 +2230,8 @@
6456d8
           if (dump.outfile != NULL)
6456d8
             fclose (dump.outfile);
6456d8
 
6456d8
-          sprintf (temp_filename, "%s-write-%03d.%s", dump.outfilename, dump_images,
6456d8
+          snprintf(temp_filename, sizeof(temp_filename), "%s-write-%03d.%s",
6456d8
+		   dump.outfilename, dump_images,
6456d8
                   (dump.format == DUMP_TEXT) ? "txt" : "raw");
6456d8
           if ((dump.outfile = fopen(temp_filename, dump.mode)) == NULL)
6456d8
             {
6456d8
diff -Naur tiff-3.9.4.orig/tools/tiffdither.c tiff-3.9.4/tools/tiffdither.c
6456d8
--- tiff-3.9.4.orig/tools/tiffdither.c	2010-06-08 14:50:44.000000000 -0400
6456d8
+++ tiff-3.9.4/tools/tiffdither.c	2013-04-16 12:52:23.890251187 -0400
6456d8
@@ -256,7 +256,7 @@
6456d8
 		TIFFSetField(out, TIFFTAG_FILLORDER, fillorder);
6456d8
 	else
6456d8
 		CopyField(TIFFTAG_FILLORDER, shortv);
6456d8
-	sprintf(thing, "Dithered B&W version of %s", argv[optind]);
6456d8
+	snprintf(thing, sizeof(thing), "Dithered B&W version of %s", argv[optind]);
6456d8
 	TIFFSetField(out, TIFFTAG_IMAGEDESCRIPTION, thing);
6456d8
 	CopyField(TIFFTAG_PHOTOMETRIC, shortv);
6456d8
 	CopyField(TIFFTAG_ORIENTATION, shortv);