Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP4:Update
tiff3
tiff-3.8.2-CVE-2013-1961.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File tiff-3.8.2-CVE-2013-1961.patch of Package tiff3
https://bugzilla.novell.com/show_bug.cgi?id=817573#c1 CVE-2013-1961 libtiff (tiff2pdf): Stack-based buffer overflow with malformed image-length and resolution ======================================================================================================== A stack-based buffer overflow was found in the way tiff2pdf, a TIFF image to a PDF document conversion tool, of libtiff, a library of functions for manipulating TIFF (Tagged Image File Format) image format files, performed write of TIFF image content into particular PDF document file, when malformed image-length and resolution values are used in the TIFF file. A remote attacker could provide a specially-crafted TIFF image format file, that when processed by tiff2pdf would lead to tiff2pdf executable crash. Index: contrib/dbs/xtiff/xtiff.c =================================================================== --- contrib/dbs/xtiff/xtiff.c.orig +++ contrib/dbs/xtiff/xtiff.c @@ -509,9 +509,9 @@ SetNameLabel() 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); } Index: libtiff/tif_dirinfo.c =================================================================== --- libtiff/tif_dirinfo.c.orig +++ libtiff/tif_dirinfo.c @@ -838,7 +838,7 @@ _TIFFCreateAnonFieldInfo(TIFF *tif, ttag /* 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; } Index: tools/rgb2ycbcr.c =================================================================== --- tools/rgb2ycbcr.c.orig +++ tools/rgb2ycbcr.c @@ -328,7 +328,8 @@ tiffcvt(TIFF* in, TIFF* out) 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()); Index: tools/tiff2bw.c =================================================================== --- tools/tiff2bw.c.orig +++ tools/tiff2bw.c @@ -201,7 +201,7 @@ main(int argc, char* argv[]) } } 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)); Index: tools/tiff2pdf.c =================================================================== --- tools/tiff2pdf.c.orig +++ tools/tiff2pdf.c @@ -3615,7 +3615,7 @@ tsize_t t2p_write_pdf_header(T2P* t2p, T 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 += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t)"\r%\342\343\317\323\r\n", 8); @@ -3629,10 +3629,10 @@ tsize_t t2p_write_pdf_header(T2P* t2p, T 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 += TIFFWriteFile(output, (tdata_t) buffer, buflen ); written += TIFFWriteFile(output, (tdata_t) " 0 obj\r", 7); @@ -3671,59 +3671,59 @@ tsize_t t2p_write_pdf_name(char* name, T written += TIFFWriteFile(output, (tdata_t) "/", 1); for (i=0;i<namelen;i++){ if ( ((unsigned char)name[i]) < 0x21){ - sprintf(buffer, "#%.2X", name[i]); + snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); written += TIFFWriteFile(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]); written += TIFFWriteFile(output, (tdata_t) buffer, 3); nextchar=1; } if (nextchar==0){ switch (name[i]){ case 0x23: - sprintf(buffer, "#%.2X", name[i]); + snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); written += TIFFWriteFile(output, (tdata_t) buffer, 3); break; case 0x25: - sprintf(buffer, "#%.2X", name[i]); + snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); written += TIFFWriteFile(output, (tdata_t) buffer, 3); break; case 0x28: - sprintf(buffer, "#%.2X", name[i]); + snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); written += TIFFWriteFile(output, (tdata_t) buffer, 3); break; case 0x29: - sprintf(buffer, "#%.2X", name[i]); + snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); written += TIFFWriteFile(output, (tdata_t) buffer, 3); break; case 0x2F: - sprintf(buffer, "#%.2X", name[i]); + snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); written += TIFFWriteFile(output, (tdata_t) buffer, 3); break; case 0x3C: - sprintf(buffer, "#%.2X", name[i]); + snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); written += TIFFWriteFile(output, (tdata_t) buffer, 3); break; case 0x3E: - sprintf(buffer, "#%.2X", name[i]); + snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); written += TIFFWriteFile(output, (tdata_t) buffer, 3); break; case 0x5B: - sprintf(buffer, "#%.2X", name[i]); + snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); written += TIFFWriteFile(output, (tdata_t) buffer, 3); break; case 0x5D: - sprintf(buffer, "#%.2X", name[i]); + snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); written += TIFFWriteFile(output, (tdata_t) buffer, 3); break; case 0x7B: - sprintf(buffer, "#%.2X", name[i]); + snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); written += TIFFWriteFile(output, (tdata_t) buffer, 3); break; case 0x7D: - sprintf(buffer, "#%.2X", name[i]); + snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); written += TIFFWriteFile(output, (tdata_t) buffer, 3); break; default: @@ -3837,14 +3837,14 @@ tsize_t t2p_write_pdf_stream_end(TIFF* o 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 += TIFFWriteFile(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 += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) " 0 R \r", 6); } @@ -3885,10 +3885,10 @@ tsize_t t2p_write_pdf_stream_dict_end(TI 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 += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) "\r", 1); @@ -3902,7 +3902,7 @@ tsize_t t2p_write_pdf_stream_length(tsiz tsize_t t2p_write_pdf_catalog(T2P* t2p, TIFF* output){ tsize_t written=0; - char buffer[16]; + char buffer[32]; int buflen=0; written += TIFFWriteFile(output, @@ -3942,8 +3942,7 @@ tsize_t t2p_write_pdf_info(T2P* t2p, TIF written += t2p_write_pdf_string(t2p->pdf_datetime, output); } written += TIFFWriteFile(output, (tdata_t) "\r/Producer ", 11); - _TIFFmemset((tdata_t)buffer, 0x00, 512); - buflen=sprintf(buffer, "libtiff / tiff2pdf - %d / %s", TIFFLIB_VERSION, T2P_VERSION); + buflen=snprintf(buffer, sizeof(buffer), "libtiff / tiff2pdf - %d / %s", TIFFLIB_VERSION, T2P_VERSION); written += t2p_write_pdf_string(buffer, output); written += TIFFWriteFile(output, (tdata_t) "\r", 1); if(t2p->pdf_creator != NULL){ @@ -4099,7 +4098,7 @@ tsize_t t2p_write_pdf_pages(T2P* t2p, tsize_t written=0; tdir_t i=0; - char buffer[16]; + char buffer[32]; int buflen=0; int page=0; @@ -4108,7 +4107,7 @@ tsize_t t2p_write_pdf_pages(T2P* t2p, 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 += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) " 0 R ", 5); if ( ((i+1)%8)==0 ) { @@ -4123,8 +4122,7 @@ tsize_t t2p_write_pdf_pages(T2P* t2p, } } written += TIFFWriteFile(output, (tdata_t) "] \r/Count ", 10); - _TIFFmemset(buffer, 0x00, 16); - buflen=sprintf(buffer, "%d", t2p->tiff_pagecount); + buflen=snprintf(buffer, sizeof(buffer), "%d", t2p->tiff_pagecount); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) " \r>> \r", 6); @@ -4139,28 +4137,28 @@ tsize_t t2p_write_pdf_page(uint32 object unsigned int i=0; tsize_t written=0; - char buffer[16]; + char buffer[256]; int buflen=0; written += TIFFWriteFile(output, (tdata_t) "<<\r/Type /Page \r/Parent ", 24); - buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_pages); + buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_pages); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) " 0 R \r", 6); written += TIFFWriteFile(output, (tdata_t) "/MediaBox [", 11); - buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.x1); + buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.x1); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) " ", 1); - buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.y1); + buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.y1); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) " ", 1); - buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.x2); + buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.x2); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) " ", 1); - buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.y2); + buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.y2); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) "] \r", 3); written += TIFFWriteFile(output, (tdata_t) "/Contents ", 10); - buflen=sprintf(buffer, "%lu", (unsigned long)(object + 1)); + buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(object + 1)); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) " 0 R \r", 6); written += TIFFWriteFile(output, (tdata_t) "/Resources << \r", 15); @@ -4168,14 +4166,14 @@ tsize_t t2p_write_pdf_page(uint32 object written += TIFFWriteFile(output, (tdata_t) "/XObject <<\r", 12); for(i=0;i<t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount;i++){ written += TIFFWriteFile(output, (tdata_t) "/Im", 3); - buflen = sprintf(buffer, "%u", t2p->pdf_page+1); + buflen = snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) "_", 1); - buflen = sprintf(buffer, "%u", i+1); + buflen = snprintf(buffer, sizeof(buffer), "%u", i+1); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) " ", 1); - buflen = sprintf( - buffer, + buflen = snprintf( + buffer, sizeof(buffer), "%lu", (unsigned long)(object+3+(2*i)+t2p->tiff_pages[t2p->pdf_page].page_extra)); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); @@ -4188,11 +4186,11 @@ tsize_t t2p_write_pdf_page(uint32 object } else { written += TIFFWriteFile(output, (tdata_t) "/XObject <<\r", 12); written += TIFFWriteFile(output, (tdata_t) "/Im", 3); - buflen = sprintf(buffer, "%u", t2p->pdf_page+1); + buflen = snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) " ", 1); - buflen = sprintf( - buffer, + buflen = snprintf( + buffer, sizeof(buffer), "%lu", (unsigned long)(object+3+(2*i)+t2p->tiff_pages[t2p->pdf_page].page_extra)); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); @@ -4202,8 +4200,8 @@ tsize_t t2p_write_pdf_page(uint32 object if(t2p->tiff_transferfunctioncount != 0) { written += TIFFWriteFile(output, (tdata_t) "/ExtGState <<", 13); TIFFWriteFile(output, (tdata_t) "/GS1 ", 5); - buflen = sprintf( - buffer, + buflen = snprintf( + buffer, sizeof(buffer), "%lu", (unsigned long)(object + 3)); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); @@ -4559,7 +4557,7 @@ tsize_t t2p_write_pdf_page_content_strea 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\r", t2p->tiff_transferfunctioncount?"/GS1 gs ":"", box.mat[0], @@ -4574,7 +4572,7 @@ tsize_t t2p_write_pdf_page_content_strea } } 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\r", t2p->tiff_transferfunctioncount?"/GS1 gs ":"", box.mat[0], @@ -4599,33 +4597,33 @@ tsize_t t2p_write_pdf_xobject_stream_dic 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 += TIFFWriteFile(output, (tdata_t) "/Type /XObject \r/Subtype /Image \r/Name /Im", 42); - buflen=sprintf(buffer, "%u", t2p->pdf_page+1); + buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); if(tile != 0){ written += TIFFWriteFile(output, (tdata_t) "_", 1); - buflen=sprintf(buffer, "%lu", (unsigned long)tile); + buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)tile); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); } written += TIFFWriteFile(output, (tdata_t) "\r/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, + buflen=snprintf( + buffer, sizeof(buffer), "%lu", (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilewidth); } else { - buflen=sprintf( - buffer, + buflen=snprintf( + buffer, sizeof(buffer), "%lu", (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth); } @@ -4634,24 +4632,23 @@ tsize_t t2p_write_pdf_xobject_stream_dic written += TIFFWriteFile(output, (tdata_t) "\r/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, + buflen=snprintf( + buffer, sizeof(buffer), "%lu", (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilelength); } else { - buflen=sprintf( - buffer, + buflen=snprintf( + buffer, sizeof(buffer), "%lu", (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength); } } written += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) "\r/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 += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) "\r/ColorSpace ", 13); written += t2p_write_pdf_xobject_cs(t2p, output); @@ -4695,11 +4692,10 @@ tsize_t t2p_write_pdf_xobject_cs(T2P* t2 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 += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(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 += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) " 0 R ]\r", 7); return(written); @@ -4733,7 +4729,7 @@ tsize_t t2p_write_pdf_xobject_cs(T2P* t2 X_W /= Y_W; Z_W /= Y_W; Y_W = 1.0F; - buflen=sprintf(buffer, "[%.4f %.4f %.4f] \r", X_W, Y_W, Z_W); + buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \r", X_W, Y_W, Z_W); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); X_W = 0.3457F; /* 0.3127F; */ /* D50, commented D65 */ Y_W = 0.3585F; /* 0.3290F; */ @@ -4741,10 +4737,10 @@ tsize_t t2p_write_pdf_xobject_cs(T2P* t2 X_W /= Y_W; Z_W /= Y_W; Y_W = 1.0F; - buflen=sprintf(buffer, "[%.4f %.4f %.4f] \r", X_W, Y_W, Z_W); + buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \r", X_W, Y_W, Z_W); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) "/Range ", 7); - buflen=sprintf(buffer, "[%d %d %d %d] \r", + buflen=snprintf(buffer, sizeof(buffer), "[%d %d %d %d] \r", t2p->pdf_labrange[0], t2p->pdf_labrange[1], t2p->pdf_labrange[2], @@ -4760,26 +4756,26 @@ tsize_t t2p_write_pdf_xobject_cs(T2P* t2 tsize_t t2p_write_pdf_transfer(T2P* t2p, TIFF* output){ tsize_t written=0; - char buffer[16]; + char buffer[32]; int buflen=0; written += TIFFWriteFile(output, (tdata_t) "<< /Type /ExtGState \r/TR ", 25); if(t2p->tiff_transferfunctioncount == 1){ - buflen=sprintf(buffer, "%lu", + buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(t2p->pdf_xrefcount + 1)); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) " 0 R ", 5); } else { written += TIFFWriteFile(output, (tdata_t) "[ ", 2); - buflen=sprintf(buffer, "%lu", + buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(t2p->pdf_xrefcount + 1)); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) " 0 R ", 5); - buflen=sprintf(buffer, "%lu", + buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(t2p->pdf_xrefcount + 2)); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) " 0 R ", 5); - buflen=sprintf(buffer, "%lu", + buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(t2p->pdf_xrefcount + 3)); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) " 0 R ", 5); @@ -4801,7 +4797,7 @@ tsize_t t2p_write_pdf_transfer_dict(T2P* written += TIFFWriteFile(output, (tdata_t) "/FunctionType 0 \r", 17); written += TIFFWriteFile(output, (tdata_t) "/Domain [0.0 1.0] \r", 19); written += TIFFWriteFile(output, (tdata_t) "/Range [0.0 1.0] \r", 18); - buflen=sprintf(buffer, "/Size [%u] \r", (1<<t2p->tiff_bitspersample)); + buflen=snprintf(buffer, sizeof(buffer), "/Size [%u] \r", (1<<t2p->tiff_bitspersample)); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) "/BitsPerSample 16 \r", 19); written += t2p_write_pdf_stream_dict(1<<(t2p->tiff_bitspersample+1), 0, output); @@ -4828,7 +4824,7 @@ tsize_t t2p_write_pdf_transfer_stream(T2 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; @@ -4896,16 +4892,16 @@ tsize_t t2p_write_pdf_xobject_calcs(T2P* written += TIFFWriteFile(output, (tdata_t) "<< \r", 4); if(t2p->pdf_colorspace & T2P_CS_CALGRAY){ written += TIFFWriteFile(output, (tdata_t) "/WhitePoint ", 12); - buflen=sprintf(buffer, "[%.4f %.4f %.4f] \r", X_W, Y_W, Z_W); + buflen=snprintf(buffer, strlen(buffer), "[%.4f %.4f %.4f] \r", X_W, Y_W, Z_W); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) "/Gamma 2.2 \r", 12); } if(t2p->pdf_colorspace & T2P_CS_CALRGB){ written += TIFFWriteFile(output, (tdata_t) "/WhitePoint ", 12); - buflen=sprintf(buffer, "[%.4f %.4f %.4f] \r", X_W, Y_W, Z_W); + buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \r", X_W, Y_W, Z_W); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) "/Matrix ", 8); - buflen=sprintf(buffer, "[%.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f] \r", + buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f] \r", X_R, Y_R, Z_R, X_G, Y_G, Z_G, X_B, Y_B, Z_B); @@ -4924,11 +4920,11 @@ tsize_t t2p_write_pdf_xobject_calcs(T2P* 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 += TIFFWriteFile(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 += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) " 0 R] \r", 7); @@ -4938,11 +4934,11 @@ tsize_t t2p_write_pdf_xobject_icccs(T2P* 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 += TIFFWriteFile(output, (tdata_t) "/N ", 3); - buflen=sprintf(buffer, "%u \r", t2p->tiff_samplesperpixel); + buflen=snprintf(buffer, sizeof(buffer), "%u \r", t2p->tiff_samplesperpixel); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) "/Alternate ", 11); t2p->pdf_colorspace ^= T2P_CS_ICCBASED; @@ -5007,7 +5003,7 @@ tsize_t t2p_write_pdf_xobject_decode(T2P 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){ @@ -5022,40 +5018,40 @@ tsize_t t2p_write_pdf_xobject_stream_fil written += TIFFWriteFile(output, (tdata_t) "<< /K -1 ", 9); if(tile==0){ written += TIFFWriteFile(output, (tdata_t) "/Columns ", 9); - buflen=sprintf(buffer, "%lu", + buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->tiff_width); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) " /Rows ", 7); - buflen=sprintf(buffer, "%lu", + buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->tiff_length); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); } else { if(t2p_tile_is_right_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)==0){ written += TIFFWriteFile(output, (tdata_t) "/Columns ", 9); - buflen=sprintf( - buffer, + buflen=snprintf( + buffer, sizeof(buffer), "%lu", (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); } else { written += TIFFWriteFile(output, (tdata_t) "/Columns ", 9); - buflen=sprintf( - buffer, + buflen=snprintf( + buffer, sizeof(buffer), "%lu", (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilewidth); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); } if(t2p_tile_is_bottom_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)==0){ written += TIFFWriteFile(output, (tdata_t) " /Rows ", 7); - buflen=sprintf( - buffer, + buflen=snprintf( + buffer, sizeof(buffer), "%lu", (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); } else { written += TIFFWriteFile(output, (tdata_t) " /Rows ", 7); - buflen=sprintf( - buffer, + buflen=snprintf( + buffer, sizeof(buffer), "%lu", (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilelength); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); @@ -5083,21 +5079,17 @@ tsize_t t2p_write_pdf_xobject_stream_fil if(t2p->pdf_compressionquality%100){ written += TIFFWriteFile(output, (tdata_t) "/DecodeParms ", 13); written += TIFFWriteFile(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 += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(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 += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(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 += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(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 += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) ">>\r", 3); } @@ -5117,16 +5109,16 @@ tsize_t t2p_write_pdf_xobject_stream_fil 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 += TIFFWriteFile(output, (tdata_t) "xref\r0 ", 7); - buflen=sprintf(buffer, "%lu", (unsigned long)(t2p->pdf_xrefcount + 1)); + buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(t2p->pdf_xrefcount + 1)); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); written += TIFFWriteFile(output, (tdata_t) " \r0000000000 65535 f\r\n", 22); for (i=0;i<t2p->pdf_xrefcount;i++){ - sprintf(buffer, "%.10lu 00000 n\r\n", + snprintf(buffer, sizeof(buffer), "%.10lu 00000 n\r\n", (unsigned long)t2p->pdf_xrefoffsets[i]); written += TIFFWriteFile(output, (tdata_t) buffer, 20); } @@ -5164,15 +5156,13 @@ tsize_t t2p_write_pdf_trailer(T2P* t2p, for (i=0; i<16; i++) sprintf(&(t2p->pdf_fileid[2*i]), "%.2hhX", fileidbuf[i]); written += TIFFWriteFile(output, (tdata_t) "trailer\r<<\r/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 += TIFFWriteFile(output, (tdata_t) buffer, buflen); - _TIFFmemset(buffer, 0x00, 32); written += TIFFWriteFile(output, (tdata_t) "\r/Root ", 7); - buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_catalog); + buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_catalog); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); - _TIFFmemset(buffer, 0x00, 32); written += TIFFWriteFile(output, (tdata_t) " 0 R \r/Info ", 12); - buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_info); + buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_info); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); _TIFFmemset(buffer, 0x00, 32); written += TIFFWriteFile(output, (tdata_t) " 0 R \r/ID[<", 11); @@ -5180,7 +5170,7 @@ tsize_t t2p_write_pdf_trailer(T2P* t2p, written += TIFFWriteFile(output, (tdata_t) "><", 2); written += TIFFWriteFile(output, (tdata_t) t2p->pdf_fileid, 32); written += TIFFWriteFile(output, (tdata_t) ">]\r>>\rstartxref\r", 16); - buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_startxref); + buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_startxref); written += TIFFWriteFile(output, (tdata_t) buffer, buflen); _TIFFmemset(buffer, 0x00, 32); written += TIFFWriteFile(output, (tdata_t) "\r%%EOF\r", 7); Index: tools/tiff2ps.c =================================================================== --- tools/tiff2ps.c.orig +++ tools/tiff2ps.c @@ -858,8 +858,8 @@ PS_Lvl2ImageDict(FILE* fd, TIFF* tif, ui imageOp = "imagemask"; (void)strcpy(im_x, "0"); - (void)sprintf(im_y, "%lu", (long) h); - (void)sprintf(im_h, "%lu", (long) h); + (void)snprintf(im_y, sizeof(im_y), "%lu", (long) h); + (void)snprintf(im_h, sizeof(im_h), "%lu", (long) h); tile_width = w; tile_height = h; if (TIFFIsTiled(tif)) { @@ -880,7 +880,7 @@ PS_Lvl2ImageDict(FILE* fd, TIFF* tif, ui } if (tile_height < h) { fputs("/im_y 0 def\n", fd); - (void)sprintf(im_y, "%lu im_y sub", (unsigned long) h); + (void)snprintf(im_y, sizeof(im_y), "%lu im_y sub", (unsigned long) h); } } else { repeat_count = tf_numberstrips; @@ -892,7 +892,7 @@ PS_Lvl2ImageDict(FILE* fd, TIFF* tif, ui fprintf(fd, "/im_h %lu def\n", (unsigned long) tile_height); (void)strcpy(im_h, "im_h"); - (void)sprintf(im_y, "%lu im_y sub", (unsigned long) h); + (void)snprintf(im_y, sizeof(im_y), "%lu im_y sub", (unsigned long) h); } } Index: tools/tiffdither.c =================================================================== --- tools/tiffdither.c.orig +++ tools/tiffdither.c @@ -256,7 +256,7 @@ main(int argc, char* argv[]) TIFFSetField(out, TIFFTAG_FILLORDER, fillorder); else CopyField(TIFFTAG_FILLORDER, shortv); - sprintf(thing, "Dithered B&W version of %s", argv[optind]); + snprintf(thing, sizeof(thing), "Dithered B&W version of %s", argv[optind]); TIFFSetField(out, TIFFTAG_IMAGEDESCRIPTION, thing); CopyField(TIFFTAG_PHOTOMETRIC, shortv); CopyField(TIFFTAG_ORIENTATION, shortv);
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
