1 |
commit: 6e971341437f10cadb7e1103f65fcb85f965c268 |
2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Dec 23 16:12:51 2016 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 29 13:11:48 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e971341 |
7 |
|
8 |
media-libs/tiff: remove unused patches |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/3224 |
11 |
|
12 |
.../tiff/files/tiff-4.0.3-CVE-2012-4447.patch | 40 -- |
13 |
.../tiff/files/tiff-4.0.3-CVE-2012-4564.patch | 86 --- |
14 |
.../tiff/files/tiff-4.0.3-CVE-2013-1960.patch | 145 ---- |
15 |
.../tiff/files/tiff-4.0.3-CVE-2013-1961.patch | 759 --------------------- |
16 |
.../tiff/files/tiff-4.0.3-CVE-2013-4231.patch | 16 - |
17 |
.../tiff/files/tiff-4.0.3-CVE-2013-4232.patch | 13 - |
18 |
.../tiff/files/tiff-4.0.3-CVE-2013-4244.patch | 15 - |
19 |
.../tiff/files/tiff-4.0.3-libjpeg-turbo.patch | 122 ---- |
20 |
.../tiff/files/tiff-4.0.3-tiff2pdf-colors.patch | 15 - |
21 |
9 files changed, 1211 deletions(-) |
22 |
|
23 |
diff --git a/media-libs/tiff/files/tiff-4.0.3-CVE-2012-4447.patch b/media-libs/tiff/files/tiff-4.0.3-CVE-2012-4447.patch |
24 |
deleted file mode 100644 |
25 |
index ebf9a00..00000000 |
26 |
--- a/media-libs/tiff/files/tiff-4.0.3-CVE-2012-4447.patch |
27 |
+++ /dev/null |
28 |
@@ -1,40 +0,0 @@ |
29 |
-Upstream patch for CVE-2012-4447. |
30 |
- |
31 |
- |
32 |
-diff -Naur tiff-4.0.3.orig/libtiff/tif_pixarlog.c tiff-4.0.3/libtiff/tif_pixarlog.c |
33 |
---- tiff-4.0.3.orig/libtiff/tif_pixarlog.c 2012-07-04 15:26:31.000000000 -0400 |
34 |
-+++ tiff-4.0.3/libtiff/tif_pixarlog.c 2012-12-12 16:43:18.931315699 -0500 |
35 |
-@@ -644,6 +644,20 @@ |
36 |
- return bytes; |
37 |
- } |
38 |
- |
39 |
-+static tmsize_t |
40 |
-+add_ms(tmsize_t m1, tmsize_t m2) |
41 |
-+{ |
42 |
-+ tmsize_t bytes = m1 + m2; |
43 |
-+ |
44 |
-+ /* if either input is zero, assume overflow already occurred */ |
45 |
-+ if (m1 == 0 || m2 == 0) |
46 |
-+ bytes = 0; |
47 |
-+ else if (bytes <= m1 || bytes <= m2) |
48 |
-+ bytes = 0; |
49 |
-+ |
50 |
-+ return bytes; |
51 |
-+} |
52 |
-+ |
53 |
- static int |
54 |
- PixarLogFixupTags(TIFF* tif) |
55 |
- { |
56 |
-@@ -671,9 +685,11 @@ |
57 |
- td->td_samplesperpixel : 1); |
58 |
- tbuf_size = multiply_ms(multiply_ms(multiply_ms(sp->stride, td->td_imagewidth), |
59 |
- td->td_rowsperstrip), sizeof(uint16)); |
60 |
-+ /* add one more stride in case input ends mid-stride */ |
61 |
-+ tbuf_size = add_ms(tbuf_size, sizeof(uint16) * sp->stride); |
62 |
- if (tbuf_size == 0) |
63 |
- return (0); /* TODO: this is an error return without error report through TIFFErrorExt */ |
64 |
-- sp->tbuf = (uint16 *) _TIFFmalloc(tbuf_size+sizeof(uint16)*sp->stride); |
65 |
-+ sp->tbuf = (uint16 *) _TIFFmalloc(tbuf_size); |
66 |
- if (sp->tbuf == NULL) |
67 |
- return (0); |
68 |
- if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN) |
69 |
|
70 |
diff --git a/media-libs/tiff/files/tiff-4.0.3-CVE-2012-4564.patch b/media-libs/tiff/files/tiff-4.0.3-CVE-2012-4564.patch |
71 |
deleted file mode 100644 |
72 |
index 3d7946c..00000000 |
73 |
--- a/media-libs/tiff/files/tiff-4.0.3-CVE-2012-4564.patch |
74 |
+++ /dev/null |
75 |
@@ -1,86 +0,0 @@ |
76 |
-Upstream patch for CVE-2012-4564. |
77 |
- |
78 |
- |
79 |
-diff -Naur tiff-4.0.3.orig/tools/ppm2tiff.c tiff-4.0.3/tools/ppm2tiff.c |
80 |
---- tiff-4.0.3.orig/tools/ppm2tiff.c 2010-04-10 15:22:34.000000000 -0400 |
81 |
-+++ tiff-4.0.3/tools/ppm2tiff.c 2012-12-12 16:43:18.932315708 -0500 |
82 |
-@@ -72,6 +72,17 @@ |
83 |
- exit(-2); |
84 |
- } |
85 |
- |
86 |
-+static tmsize_t |
87 |
-+multiply_ms(tmsize_t m1, tmsize_t m2) |
88 |
-+{ |
89 |
-+ tmsize_t bytes = m1 * m2; |
90 |
-+ |
91 |
-+ if (m1 && bytes / m1 != m2) |
92 |
-+ bytes = 0; |
93 |
-+ |
94 |
-+ return bytes; |
95 |
-+} |
96 |
-+ |
97 |
- int |
98 |
- main(int argc, char* argv[]) |
99 |
- { |
100 |
-@@ -79,7 +90,7 @@ |
101 |
- uint32 rowsperstrip = (uint32) -1; |
102 |
- double resolution = -1; |
103 |
- unsigned char *buf = NULL; |
104 |
-- tsize_t linebytes = 0; |
105 |
-+ tmsize_t linebytes = 0; |
106 |
- uint16 spp = 1; |
107 |
- uint16 bpp = 8; |
108 |
- TIFF *out; |
109 |
-@@ -89,6 +100,7 @@ |
110 |
- int c; |
111 |
- extern int optind; |
112 |
- extern char* optarg; |
113 |
-+ tmsize_t scanline_size; |
114 |
- |
115 |
- if (argc < 2) { |
116 |
- fprintf(stderr, "%s: Too few arguments\n", argv[0]); |
117 |
-@@ -221,7 +233,8 @@ |
118 |
- } |
119 |
- switch (bpp) { |
120 |
- case 1: |
121 |
-- linebytes = (spp * w + (8 - 1)) / 8; |
122 |
-+ /* if round-up overflows, result will be zero, OK */ |
123 |
-+ linebytes = (multiply_ms(spp, w) + (8 - 1)) / 8; |
124 |
- if (rowsperstrip == (uint32) -1) { |
125 |
- TIFFSetField(out, TIFFTAG_ROWSPERSTRIP, h); |
126 |
- } else { |
127 |
-@@ -230,15 +243,31 @@ |
128 |
- } |
129 |
- break; |
130 |
- case 8: |
131 |
-- linebytes = spp * w; |
132 |
-+ linebytes = multiply_ms(spp, w); |
133 |
- TIFFSetField(out, TIFFTAG_ROWSPERSTRIP, |
134 |
- TIFFDefaultStripSize(out, rowsperstrip)); |
135 |
- break; |
136 |
- } |
137 |
-- if (TIFFScanlineSize(out) > linebytes) |
138 |
-+ if (linebytes == 0) { |
139 |
-+ fprintf(stderr, "%s: scanline size overflow\n", infile); |
140 |
-+ (void) TIFFClose(out); |
141 |
-+ exit(-2); |
142 |
-+ } |
143 |
-+ scanline_size = TIFFScanlineSize(out); |
144 |
-+ if (scanline_size == 0) { |
145 |
-+ /* overflow - TIFFScanlineSize already printed a message */ |
146 |
-+ (void) TIFFClose(out); |
147 |
-+ exit(-2); |
148 |
-+ } |
149 |
-+ if (scanline_size < linebytes) |
150 |
- buf = (unsigned char *)_TIFFmalloc(linebytes); |
151 |
- else |
152 |
-- buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(out)); |
153 |
-+ buf = (unsigned char *)_TIFFmalloc(scanline_size); |
154 |
-+ if (buf == NULL) { |
155 |
-+ fprintf(stderr, "%s: Not enough memory\n", infile); |
156 |
-+ (void) TIFFClose(out); |
157 |
-+ exit(-2); |
158 |
-+ } |
159 |
- if (resolution > 0) { |
160 |
- TIFFSetField(out, TIFFTAG_XRESOLUTION, resolution); |
161 |
- TIFFSetField(out, TIFFTAG_YRESOLUTION, resolution); |
162 |
|
163 |
diff --git a/media-libs/tiff/files/tiff-4.0.3-CVE-2013-1960.patch b/media-libs/tiff/files/tiff-4.0.3-CVE-2013-1960.patch |
164 |
deleted file mode 100644 |
165 |
index 1c8dfb7..00000000 |
166 |
--- a/media-libs/tiff/files/tiff-4.0.3-CVE-2013-1960.patch |
167 |
+++ /dev/null |
168 |
@@ -1,145 +0,0 @@ |
169 |
-diff -Naur tiff-4.0.3.orig/tools/tiff2pdf.c tiff-4.0.3/tools/tiff2pdf.c |
170 |
---- tiff-4.0.3.orig/tools/tiff2pdf.c 2012-07-25 22:56:43.000000000 -0400 |
171 |
-+++ tiff-4.0.3/tools/tiff2pdf.c 2013-05-02 12:04:49.057090227 -0400 |
172 |
-@@ -3341,33 +3341,56 @@ |
173 |
- uint32 height){ |
174 |
- |
175 |
- tsize_t i=0; |
176 |
-- uint16 ri =0; |
177 |
-- uint16 v_samp=1; |
178 |
-- uint16 h_samp=1; |
179 |
-- int j=0; |
180 |
-- |
181 |
-- i++; |
182 |
-- |
183 |
-- while(i<(*striplength)){ |
184 |
-+ |
185 |
-+ while (i < *striplength) { |
186 |
-+ tsize_t datalen; |
187 |
-+ uint16 ri; |
188 |
-+ uint16 v_samp; |
189 |
-+ uint16 h_samp; |
190 |
-+ int j; |
191 |
-+ int ncomp; |
192 |
-+ |
193 |
-+ /* marker header: one or more FFs */ |
194 |
-+ if (strip[i] != 0xff) |
195 |
-+ return(0); |
196 |
-+ i++; |
197 |
-+ while (i < *striplength && strip[i] == 0xff) |
198 |
-+ i++; |
199 |
-+ if (i >= *striplength) |
200 |
-+ return(0); |
201 |
-+ /* SOI is the only pre-SOS marker without a length word */ |
202 |
-+ if (strip[i] == 0xd8) |
203 |
-+ datalen = 0; |
204 |
-+ else { |
205 |
-+ if ((*striplength - i) <= 2) |
206 |
-+ return(0); |
207 |
-+ datalen = (strip[i+1] << 8) | strip[i+2]; |
208 |
-+ if (datalen < 2 || datalen >= (*striplength - i)) |
209 |
-+ return(0); |
210 |
-+ } |
211 |
- switch( strip[i] ){ |
212 |
-- case 0xd8: |
213 |
-- /* SOI - start of image */ |
214 |
-+ case 0xd8: /* SOI - start of image */ |
215 |
- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), 2); |
216 |
- *bufferoffset+=2; |
217 |
-- i+=2; |
218 |
- break; |
219 |
-- case 0xc0: |
220 |
-- case 0xc1: |
221 |
-- case 0xc3: |
222 |
-- case 0xc9: |
223 |
-- case 0xca: |
224 |
-+ case 0xc0: /* SOF0 */ |
225 |
-+ case 0xc1: /* SOF1 */ |
226 |
-+ case 0xc3: /* SOF3 */ |
227 |
-+ case 0xc9: /* SOF9 */ |
228 |
-+ case 0xca: /* SOF10 */ |
229 |
- if(no==0){ |
230 |
-- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2); |
231 |
-- for(j=0;j<buffer[*bufferoffset+9];j++){ |
232 |
-- if( (buffer[*bufferoffset+11+(2*j)]>>4) > h_samp) |
233 |
-- h_samp = (buffer[*bufferoffset+11+(2*j)]>>4); |
234 |
-- if( (buffer[*bufferoffset+11+(2*j)] & 0x0f) > v_samp) |
235 |
-- v_samp = (buffer[*bufferoffset+11+(2*j)] & 0x0f); |
236 |
-+ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), datalen+2); |
237 |
-+ ncomp = buffer[*bufferoffset+9]; |
238 |
-+ if (ncomp < 1 || ncomp > 4) |
239 |
-+ return(0); |
240 |
-+ v_samp=1; |
241 |
-+ h_samp=1; |
242 |
-+ for(j=0;j<ncomp;j++){ |
243 |
-+ uint16 samp = buffer[*bufferoffset+11+(3*j)]; |
244 |
-+ if( (samp>>4) > h_samp) |
245 |
-+ h_samp = (samp>>4); |
246 |
-+ if( (samp & 0x0f) > v_samp) |
247 |
-+ v_samp = (samp & 0x0f); |
248 |
- } |
249 |
- v_samp*=8; |
250 |
- h_samp*=8; |
251 |
-@@ -3381,45 +3404,43 @@ |
252 |
- (unsigned char) ((height>>8) & 0xff); |
253 |
- buffer[*bufferoffset+6]= |
254 |
- (unsigned char) (height & 0xff); |
255 |
-- *bufferoffset+=strip[i+2]+2; |
256 |
-- i+=strip[i+2]+2; |
257 |
-- |
258 |
-+ *bufferoffset+=datalen+2; |
259 |
-+ /* insert a DRI marker */ |
260 |
- buffer[(*bufferoffset)++]=0xff; |
261 |
- buffer[(*bufferoffset)++]=0xdd; |
262 |
- buffer[(*bufferoffset)++]=0x00; |
263 |
- buffer[(*bufferoffset)++]=0x04; |
264 |
- buffer[(*bufferoffset)++]=(ri >> 8) & 0xff; |
265 |
- buffer[(*bufferoffset)++]= ri & 0xff; |
266 |
-- } else { |
267 |
-- i+=strip[i+2]+2; |
268 |
- } |
269 |
- break; |
270 |
-- case 0xc4: |
271 |
-- case 0xdb: |
272 |
-- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2); |
273 |
-- *bufferoffset+=strip[i+2]+2; |
274 |
-- i+=strip[i+2]+2; |
275 |
-+ case 0xc4: /* DHT */ |
276 |
-+ case 0xdb: /* DQT */ |
277 |
-+ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), datalen+2); |
278 |
-+ *bufferoffset+=datalen+2; |
279 |
- break; |
280 |
-- case 0xda: |
281 |
-+ case 0xda: /* SOS */ |
282 |
- if(no==0){ |
283 |
-- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2); |
284 |
-- *bufferoffset+=strip[i+2]+2; |
285 |
-- i+=strip[i+2]+2; |
286 |
-+ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), datalen+2); |
287 |
-+ *bufferoffset+=datalen+2; |
288 |
- } else { |
289 |
- buffer[(*bufferoffset)++]=0xff; |
290 |
- buffer[(*bufferoffset)++]= |
291 |
- (unsigned char)(0xd0 | ((no-1)%8)); |
292 |
-- i+=strip[i+2]+2; |
293 |
- } |
294 |
-- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), (*striplength)-i-1); |
295 |
-- *bufferoffset+=(*striplength)-i-1; |
296 |
-+ i += datalen + 1; |
297 |
-+ /* copy remainder of strip */ |
298 |
-+ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i]), *striplength - i); |
299 |
-+ *bufferoffset+= *striplength - i; |
300 |
- return(1); |
301 |
- default: |
302 |
-- i+=strip[i+2]+2; |
303 |
-+ /* ignore any other marker */ |
304 |
-+ break; |
305 |
- } |
306 |
-+ i += datalen + 1; |
307 |
- } |
308 |
-- |
309 |
- |
310 |
-+ /* failed to find SOS marker */ |
311 |
- return(0); |
312 |
- } |
313 |
- #endif |
314 |
|
315 |
diff --git a/media-libs/tiff/files/tiff-4.0.3-CVE-2013-1961.patch b/media-libs/tiff/files/tiff-4.0.3-CVE-2013-1961.patch |
316 |
deleted file mode 100644 |
317 |
index 0ea9b52..00000000 |
318 |
--- a/media-libs/tiff/files/tiff-4.0.3-CVE-2013-1961.patch |
319 |
+++ /dev/null |
320 |
@@ -1,759 +0,0 @@ |
321 |
-diff -Naur tiff-4.0.3.orig/contrib/dbs/xtiff/xtiff.c tiff-4.0.3/contrib/dbs/xtiff/xtiff.c |
322 |
---- tiff-4.0.3.orig/contrib/dbs/xtiff/xtiff.c 2010-06-08 14:55:15.000000000 -0400 |
323 |
-+++ tiff-4.0.3/contrib/dbs/xtiff/xtiff.c 2013-05-02 12:02:42.782287939 -0400 |
324 |
-@@ -512,9 +512,9 @@ |
325 |
- Arg args[1]; |
326 |
- |
327 |
- if (tfMultiPage) |
328 |
-- sprintf(buffer, "%s - page %d", fileName, tfDirectory); |
329 |
-+ snprintf(buffer, sizeof(buffer), "%s - page %d", fileName, tfDirectory); |
330 |
- else |
331 |
-- strcpy(buffer, fileName); |
332 |
-+ snprintf(buffer, sizeof(buffer), "%s", fileName); |
333 |
- XtSetArg(args[0], XtNlabel, buffer); |
334 |
- XtSetValues(labelWidget, args, 1); |
335 |
- } |
336 |
-diff -Naur tiff-4.0.3.orig/libtiff/tif_codec.c tiff-4.0.3/libtiff/tif_codec.c |
337 |
---- tiff-4.0.3.orig/libtiff/tif_codec.c 2010-12-14 09:18:28.000000000 -0500 |
338 |
-+++ tiff-4.0.3/libtiff/tif_codec.c 2013-05-02 12:02:42.783287946 -0400 |
339 |
-@@ -108,7 +108,8 @@ |
340 |
- const TIFFCodec* c = TIFFFindCODEC(tif->tif_dir.td_compression); |
341 |
- char compression_code[20]; |
342 |
- |
343 |
-- sprintf( compression_code, "%d", tif->tif_dir.td_compression ); |
344 |
-+ snprintf(compression_code, sizeof(compression_code), "%d", |
345 |
-+ tif->tif_dir.td_compression ); |
346 |
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name, |
347 |
- "%s compression support is not configured", |
348 |
- c ? c->name : compression_code ); |
349 |
-diff -Naur tiff-4.0.3.orig/libtiff/tif_dirinfo.c tiff-4.0.3/libtiff/tif_dirinfo.c |
350 |
---- tiff-4.0.3.orig/libtiff/tif_dirinfo.c 2012-08-19 12:56:34.000000000 -0400 |
351 |
-+++ tiff-4.0.3/libtiff/tif_dirinfo.c 2013-05-02 12:02:42.784287953 -0400 |
352 |
-@@ -711,7 +711,7 @@ |
353 |
- * note that this name is a special sign to TIFFClose() and |
354 |
- * _TIFFSetupFields() to free the field |
355 |
- */ |
356 |
-- sprintf(fld->field_name, "Tag %d", (int) tag); |
357 |
-+ snprintf(fld->field_name, 32, "Tag %d", (int) tag); |
358 |
- |
359 |
- return fld; |
360 |
- } |
361 |
-diff -Naur tiff-4.0.3.orig/tools/rgb2ycbcr.c tiff-4.0.3/tools/rgb2ycbcr.c |
362 |
---- tiff-4.0.3.orig/tools/rgb2ycbcr.c 2011-05-31 13:03:16.000000000 -0400 |
363 |
-+++ tiff-4.0.3/tools/rgb2ycbcr.c 2013-05-02 12:02:42.785287961 -0400 |
364 |
-@@ -332,7 +332,8 @@ |
365 |
- TIFFSetField(out, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); |
366 |
- { char buf[2048]; |
367 |
- char *cp = strrchr(TIFFFileName(in), '/'); |
368 |
-- sprintf(buf, "YCbCr conversion of %s", cp ? cp+1 : TIFFFileName(in)); |
369 |
-+ snprintf(buf, sizeof(buf), "YCbCr conversion of %s", |
370 |
-+ cp ? cp+1 : TIFFFileName(in)); |
371 |
- TIFFSetField(out, TIFFTAG_IMAGEDESCRIPTION, buf); |
372 |
- } |
373 |
- TIFFSetField(out, TIFFTAG_SOFTWARE, TIFFGetVersion()); |
374 |
-diff -Naur tiff-4.0.3.orig/tools/tiff2bw.c tiff-4.0.3/tools/tiff2bw.c |
375 |
---- tiff-4.0.3.orig/tools/tiff2bw.c 2010-07-08 12:10:24.000000000 -0400 |
376 |
-+++ tiff-4.0.3/tools/tiff2bw.c 2013-05-02 12:02:42.785287961 -0400 |
377 |
-@@ -205,7 +205,7 @@ |
378 |
- } |
379 |
- } |
380 |
- TIFFSetField(out, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK); |
381 |
-- sprintf(thing, "B&W version of %s", argv[optind]); |
382 |
-+ snprintf(thing, sizeof(thing), "B&W version of %s", argv[optind]); |
383 |
- TIFFSetField(out, TIFFTAG_IMAGEDESCRIPTION, thing); |
384 |
- TIFFSetField(out, TIFFTAG_SOFTWARE, "tiff2bw"); |
385 |
- outbuf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(out)); |
386 |
-diff -Naur tiff-4.0.3.orig/tools/tiff2pdf.c tiff-4.0.3/tools/tiff2pdf.c |
387 |
---- tiff-4.0.3.orig/tools/tiff2pdf.c 2012-07-25 22:56:43.000000000 -0400 |
388 |
-+++ tiff-4.0.3/tools/tiff2pdf.c 2013-05-02 12:02:42.788287983 -0400 |
389 |
-@@ -3609,7 +3609,9 @@ |
390 |
- char buffer[16]; |
391 |
- int buflen=0; |
392 |
- |
393 |
-- buflen=sprintf(buffer, "%%PDF-%u.%u ", t2p->pdf_majorversion&0xff, t2p->pdf_minorversion&0xff); |
394 |
-+ buflen = snprintf(buffer, sizeof(buffer), "%%PDF-%u.%u ", |
395 |
-+ t2p->pdf_majorversion&0xff, |
396 |
-+ t2p->pdf_minorversion&0xff); |
397 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
398 |
- written += t2pWriteFile(output, (tdata_t)"\n%\342\343\317\323\n", 7); |
399 |
- |
400 |
-@@ -3623,10 +3625,10 @@ |
401 |
- tsize_t t2p_write_pdf_obj_start(uint32 number, TIFF* output){ |
402 |
- |
403 |
- tsize_t written=0; |
404 |
-- char buffer[16]; |
405 |
-+ char buffer[32]; |
406 |
- int buflen=0; |
407 |
- |
408 |
-- buflen=sprintf(buffer, "%lu", (unsigned long)number); |
409 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)number); |
410 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen ); |
411 |
- written += t2pWriteFile(output, (tdata_t) " 0 obj\n", 7); |
412 |
- |
413 |
-@@ -3665,13 +3667,13 @@ |
414 |
- written += t2pWriteFile(output, (tdata_t) "/", 1); |
415 |
- for (i=0;i<namelen;i++){ |
416 |
- if ( ((unsigned char)name[i]) < 0x21){ |
417 |
-- sprintf(buffer, "#%.2X", name[i]); |
418 |
-+ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); |
419 |
- buffer[sizeof(buffer) - 1] = '\0'; |
420 |
- written += t2pWriteFile(output, (tdata_t) buffer, 3); |
421 |
- nextchar=1; |
422 |
- } |
423 |
- if ( ((unsigned char)name[i]) > 0x7E){ |
424 |
-- sprintf(buffer, "#%.2X", name[i]); |
425 |
-+ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); |
426 |
- buffer[sizeof(buffer) - 1] = '\0'; |
427 |
- written += t2pWriteFile(output, (tdata_t) buffer, 3); |
428 |
- nextchar=1; |
429 |
-@@ -3679,57 +3681,57 @@ |
430 |
- if (nextchar==0){ |
431 |
- switch (name[i]){ |
432 |
- case 0x23: |
433 |
-- sprintf(buffer, "#%.2X", name[i]); |
434 |
-+ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); |
435 |
- buffer[sizeof(buffer) - 1] = '\0'; |
436 |
- written += t2pWriteFile(output, (tdata_t) buffer, 3); |
437 |
- break; |
438 |
- case 0x25: |
439 |
-- sprintf(buffer, "#%.2X", name[i]); |
440 |
-+ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); |
441 |
- buffer[sizeof(buffer) - 1] = '\0'; |
442 |
- written += t2pWriteFile(output, (tdata_t) buffer, 3); |
443 |
- break; |
444 |
- case 0x28: |
445 |
-- sprintf(buffer, "#%.2X", name[i]); |
446 |
-+ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); |
447 |
- buffer[sizeof(buffer) - 1] = '\0'; |
448 |
- written += t2pWriteFile(output, (tdata_t) buffer, 3); |
449 |
- break; |
450 |
- case 0x29: |
451 |
-- sprintf(buffer, "#%.2X", name[i]); |
452 |
-+ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); |
453 |
- buffer[sizeof(buffer) - 1] = '\0'; |
454 |
- written += t2pWriteFile(output, (tdata_t) buffer, 3); |
455 |
- break; |
456 |
- case 0x2F: |
457 |
-- sprintf(buffer, "#%.2X", name[i]); |
458 |
-+ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); |
459 |
- buffer[sizeof(buffer) - 1] = '\0'; |
460 |
- written += t2pWriteFile(output, (tdata_t) buffer, 3); |
461 |
- break; |
462 |
- case 0x3C: |
463 |
-- sprintf(buffer, "#%.2X", name[i]); |
464 |
-+ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); |
465 |
- buffer[sizeof(buffer) - 1] = '\0'; |
466 |
- written += t2pWriteFile(output, (tdata_t) buffer, 3); |
467 |
- break; |
468 |
- case 0x3E: |
469 |
-- sprintf(buffer, "#%.2X", name[i]); |
470 |
-+ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); |
471 |
- buffer[sizeof(buffer) - 1] = '\0'; |
472 |
- written += t2pWriteFile(output, (tdata_t) buffer, 3); |
473 |
- break; |
474 |
- case 0x5B: |
475 |
-- sprintf(buffer, "#%.2X", name[i]); |
476 |
-+ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); |
477 |
- buffer[sizeof(buffer) - 1] = '\0'; |
478 |
- written += t2pWriteFile(output, (tdata_t) buffer, 3); |
479 |
- break; |
480 |
- case 0x5D: |
481 |
-- sprintf(buffer, "#%.2X", name[i]); |
482 |
-+ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); |
483 |
- buffer[sizeof(buffer) - 1] = '\0'; |
484 |
- written += t2pWriteFile(output, (tdata_t) buffer, 3); |
485 |
- break; |
486 |
- case 0x7B: |
487 |
-- sprintf(buffer, "#%.2X", name[i]); |
488 |
-+ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); |
489 |
- buffer[sizeof(buffer) - 1] = '\0'; |
490 |
- written += t2pWriteFile(output, (tdata_t) buffer, 3); |
491 |
- break; |
492 |
- case 0x7D: |
493 |
-- sprintf(buffer, "#%.2X", name[i]); |
494 |
-+ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); |
495 |
- buffer[sizeof(buffer) - 1] = '\0'; |
496 |
- written += t2pWriteFile(output, (tdata_t) buffer, 3); |
497 |
- break; |
498 |
-@@ -3844,14 +3846,14 @@ |
499 |
- tsize_t t2p_write_pdf_stream_dict(tsize_t len, uint32 number, TIFF* output){ |
500 |
- |
501 |
- tsize_t written=0; |
502 |
-- char buffer[16]; |
503 |
-+ char buffer[32]; |
504 |
- int buflen=0; |
505 |
- |
506 |
- written += t2pWriteFile(output, (tdata_t) "/Length ", 8); |
507 |
- if(len!=0){ |
508 |
- written += t2p_write_pdf_stream_length(len, output); |
509 |
- } else { |
510 |
-- buflen=sprintf(buffer, "%lu", (unsigned long)number); |
511 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)number); |
512 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
513 |
- written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6); |
514 |
- } |
515 |
-@@ -3892,10 +3894,10 @@ |
516 |
- tsize_t t2p_write_pdf_stream_length(tsize_t len, TIFF* output){ |
517 |
- |
518 |
- tsize_t written=0; |
519 |
-- char buffer[16]; |
520 |
-+ char buffer[32]; |
521 |
- int buflen=0; |
522 |
- |
523 |
-- buflen=sprintf(buffer, "%lu", (unsigned long)len); |
524 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)len); |
525 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
526 |
- written += t2pWriteFile(output, (tdata_t) "\n", 1); |
527 |
- |
528 |
-@@ -3909,7 +3911,7 @@ |
529 |
- tsize_t t2p_write_pdf_catalog(T2P* t2p, TIFF* output) |
530 |
- { |
531 |
- tsize_t written = 0; |
532 |
-- char buffer[16]; |
533 |
-+ char buffer[32]; |
534 |
- int buflen = 0; |
535 |
- |
536 |
- written += t2pWriteFile(output, |
537 |
-@@ -3948,7 +3950,6 @@ |
538 |
- written += t2p_write_pdf_string(t2p->pdf_datetime, output); |
539 |
- } |
540 |
- written += t2pWriteFile(output, (tdata_t) "\n/Producer ", 11); |
541 |
-- _TIFFmemset((tdata_t)buffer, 0x00, sizeof(buffer)); |
542 |
- snprintf(buffer, sizeof(buffer), "libtiff / tiff2pdf - %d", TIFFLIB_VERSION); |
543 |
- written += t2p_write_pdf_string(buffer, output); |
544 |
- written += t2pWriteFile(output, (tdata_t) "\n", 1); |
545 |
-@@ -4089,7 +4090,7 @@ |
546 |
- { |
547 |
- tsize_t written=0; |
548 |
- tdir_t i=0; |
549 |
-- char buffer[16]; |
550 |
-+ char buffer[32]; |
551 |
- int buflen=0; |
552 |
- |
553 |
- int page=0; |
554 |
-@@ -4097,7 +4098,7 @@ |
555 |
- (tdata_t) "<< \n/Type /Pages \n/Kids [ ", 26); |
556 |
- page = t2p->pdf_pages+1; |
557 |
- for (i=0;i<t2p->tiff_pagecount;i++){ |
558 |
-- buflen=sprintf(buffer, "%d", page); |
559 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%d", page); |
560 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
561 |
- written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); |
562 |
- if ( ((i+1)%8)==0 ) { |
563 |
-@@ -4112,8 +4113,7 @@ |
564 |
- } |
565 |
- } |
566 |
- written += t2pWriteFile(output, (tdata_t) "] \n/Count ", 10); |
567 |
-- _TIFFmemset(buffer, 0x00, 16); |
568 |
-- buflen=sprintf(buffer, "%d", t2p->tiff_pagecount); |
569 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%d", t2p->tiff_pagecount); |
570 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
571 |
- written += t2pWriteFile(output, (tdata_t) " \n>> \n", 6); |
572 |
- |
573 |
-@@ -4128,28 +4128,28 @@ |
574 |
- |
575 |
- unsigned int i=0; |
576 |
- tsize_t written=0; |
577 |
-- char buffer[16]; |
578 |
-+ char buffer[256]; |
579 |
- int buflen=0; |
580 |
- |
581 |
- written += t2pWriteFile(output, (tdata_t) "<<\n/Type /Page \n/Parent ", 24); |
582 |
-- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_pages); |
583 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_pages); |
584 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
585 |
- written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6); |
586 |
- written += t2pWriteFile(output, (tdata_t) "/MediaBox [", 11); |
587 |
-- buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.x1); |
588 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.x1); |
589 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
590 |
- written += t2pWriteFile(output, (tdata_t) " ", 1); |
591 |
-- buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.y1); |
592 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.y1); |
593 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
594 |
- written += t2pWriteFile(output, (tdata_t) " ", 1); |
595 |
-- buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.x2); |
596 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.x2); |
597 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
598 |
- written += t2pWriteFile(output, (tdata_t) " ", 1); |
599 |
-- buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.y2); |
600 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.y2); |
601 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
602 |
- written += t2pWriteFile(output, (tdata_t) "] \n", 3); |
603 |
- written += t2pWriteFile(output, (tdata_t) "/Contents ", 10); |
604 |
-- buflen=sprintf(buffer, "%lu", (unsigned long)(object + 1)); |
605 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(object + 1)); |
606 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
607 |
- written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6); |
608 |
- written += t2pWriteFile(output, (tdata_t) "/Resources << \n", 15); |
609 |
-@@ -4157,15 +4157,13 @@ |
610 |
- written += t2pWriteFile(output, (tdata_t) "/XObject <<\n", 12); |
611 |
- for(i=0;i<t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount;i++){ |
612 |
- written += t2pWriteFile(output, (tdata_t) "/Im", 3); |
613 |
-- buflen = sprintf(buffer, "%u", t2p->pdf_page+1); |
614 |
-+ buflen = snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1); |
615 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
616 |
- written += t2pWriteFile(output, (tdata_t) "_", 1); |
617 |
-- buflen = sprintf(buffer, "%u", i+1); |
618 |
-+ buflen = snprintf(buffer, sizeof(buffer), "%u", i+1); |
619 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
620 |
- written += t2pWriteFile(output, (tdata_t) " ", 1); |
621 |
-- buflen = sprintf( |
622 |
-- buffer, |
623 |
-- "%lu", |
624 |
-+ buflen = snprintf(buffer, sizeof(buffer), "%lu", |
625 |
- (unsigned long)(object+3+(2*i)+t2p->tiff_pages[t2p->pdf_page].page_extra)); |
626 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
627 |
- written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); |
628 |
-@@ -4177,12 +4175,10 @@ |
629 |
- } else { |
630 |
- written += t2pWriteFile(output, (tdata_t) "/XObject <<\n", 12); |
631 |
- written += t2pWriteFile(output, (tdata_t) "/Im", 3); |
632 |
-- buflen = sprintf(buffer, "%u", t2p->pdf_page+1); |
633 |
-+ buflen = snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1); |
634 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
635 |
- written += t2pWriteFile(output, (tdata_t) " ", 1); |
636 |
-- buflen = sprintf( |
637 |
-- buffer, |
638 |
-- "%lu", |
639 |
-+ buflen = snprintf(buffer, sizeof(buffer), "%lu", |
640 |
- (unsigned long)(object+3+(2*i)+t2p->tiff_pages[t2p->pdf_page].page_extra)); |
641 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
642 |
- written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); |
643 |
-@@ -4191,9 +4187,7 @@ |
644 |
- if(t2p->tiff_transferfunctioncount != 0) { |
645 |
- written += t2pWriteFile(output, (tdata_t) "/ExtGState <<", 13); |
646 |
- t2pWriteFile(output, (tdata_t) "/GS1 ", 5); |
647 |
-- buflen = sprintf( |
648 |
-- buffer, |
649 |
-- "%lu", |
650 |
-+ buflen = snprintf(buffer, sizeof(buffer), "%lu", |
651 |
- (unsigned long)(object + 3)); |
652 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
653 |
- written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); |
654 |
-@@ -4566,7 +4560,7 @@ |
655 |
- if(t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount>0){ |
656 |
- for(i=0;i<t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount; i++){ |
657 |
- box=t2p->tiff_tiles[t2p->pdf_page].tiles_tiles[i].tile_box; |
658 |
-- buflen=sprintf(buffer, |
659 |
-+ buflen=snprintf(buffer, sizeof(buffer), |
660 |
- "q %s %.4f %.4f %.4f %.4f %.4f %.4f cm /Im%d_%ld Do Q\n", |
661 |
- t2p->tiff_transferfunctioncount?"/GS1 gs ":"", |
662 |
- box.mat[0], |
663 |
-@@ -4581,7 +4575,7 @@ |
664 |
- } |
665 |
- } else { |
666 |
- box=t2p->pdf_imagebox; |
667 |
-- buflen=sprintf(buffer, |
668 |
-+ buflen=snprintf(buffer, sizeof(buffer), |
669 |
- "q %s %.4f %.4f %.4f %.4f %.4f %.4f cm /Im%d Do Q\n", |
670 |
- t2p->tiff_transferfunctioncount?"/GS1 gs ":"", |
671 |
- box.mat[0], |
672 |
-@@ -4606,59 +4600,48 @@ |
673 |
- TIFF* output){ |
674 |
- |
675 |
- tsize_t written=0; |
676 |
-- char buffer[16]; |
677 |
-+ char buffer[32]; |
678 |
- int buflen=0; |
679 |
- |
680 |
- written += t2p_write_pdf_stream_dict(0, t2p->pdf_xrefcount+1, output); |
681 |
- written += t2pWriteFile(output, |
682 |
- (tdata_t) "/Type /XObject \n/Subtype /Image \n/Name /Im", |
683 |
- 42); |
684 |
-- buflen=sprintf(buffer, "%u", t2p->pdf_page+1); |
685 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1); |
686 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
687 |
- if(tile != 0){ |
688 |
- written += t2pWriteFile(output, (tdata_t) "_", 1); |
689 |
-- buflen=sprintf(buffer, "%lu", (unsigned long)tile); |
690 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)tile); |
691 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
692 |
- } |
693 |
- written += t2pWriteFile(output, (tdata_t) "\n/Width ", 8); |
694 |
-- _TIFFmemset((tdata_t)buffer, 0x00, 16); |
695 |
- if(tile==0){ |
696 |
-- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->tiff_width); |
697 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->tiff_width); |
698 |
- } else { |
699 |
- if(t2p_tile_is_right_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)!=0){ |
700 |
-- buflen=sprintf( |
701 |
-- buffer, |
702 |
-- "%lu", |
703 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%lu", |
704 |
- (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilewidth); |
705 |
- } else { |
706 |
-- buflen=sprintf( |
707 |
-- buffer, |
708 |
-- "%lu", |
709 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%lu", |
710 |
- (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth); |
711 |
- } |
712 |
- } |
713 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
714 |
- written += t2pWriteFile(output, (tdata_t) "\n/Height ", 9); |
715 |
-- _TIFFmemset((tdata_t)buffer, 0x00, 16); |
716 |
- if(tile==0){ |
717 |
-- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->tiff_length); |
718 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->tiff_length); |
719 |
- } else { |
720 |
- if(t2p_tile_is_bottom_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)!=0){ |
721 |
-- buflen=sprintf( |
722 |
-- buffer, |
723 |
-- "%lu", |
724 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%lu", |
725 |
- (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilelength); |
726 |
- } else { |
727 |
-- buflen=sprintf( |
728 |
-- buffer, |
729 |
-- "%lu", |
730 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%lu", |
731 |
- (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength); |
732 |
- } |
733 |
- } |
734 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
735 |
- written += t2pWriteFile(output, (tdata_t) "\n/BitsPerComponent ", 19); |
736 |
-- _TIFFmemset((tdata_t)buffer, 0x00, 16); |
737 |
-- buflen=sprintf(buffer, "%u", t2p->tiff_bitspersample); |
738 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->tiff_bitspersample); |
739 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
740 |
- written += t2pWriteFile(output, (tdata_t) "\n/ColorSpace ", 13); |
741 |
- written += t2p_write_pdf_xobject_cs(t2p, output); |
742 |
-@@ -4702,11 +4685,10 @@ |
743 |
- t2p->pdf_colorspace ^= T2P_CS_PALETTE; |
744 |
- written += t2p_write_pdf_xobject_cs(t2p, output); |
745 |
- t2p->pdf_colorspace |= T2P_CS_PALETTE; |
746 |
-- buflen=sprintf(buffer, "%u", (0x0001 << t2p->tiff_bitspersample)-1 ); |
747 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%u", (0x0001 << t2p->tiff_bitspersample)-1 ); |
748 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
749 |
- written += t2pWriteFile(output, (tdata_t) " ", 1); |
750 |
-- _TIFFmemset(buffer, 0x00, 16); |
751 |
-- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_palettecs ); |
752 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_palettecs ); |
753 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
754 |
- written += t2pWriteFile(output, (tdata_t) " 0 R ]\n", 7); |
755 |
- return(written); |
756 |
-@@ -4740,10 +4722,10 @@ |
757 |
- X_W /= Y_W; |
758 |
- Z_W /= Y_W; |
759 |
- Y_W = 1.0F; |
760 |
-- buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); |
761 |
-+ buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); |
762 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
763 |
- written += t2pWriteFile(output, (tdata_t) "/Range ", 7); |
764 |
-- buflen=sprintf(buffer, "[%d %d %d %d] \n", |
765 |
-+ buflen=snprintf(buffer, sizeof(buffer), "[%d %d %d %d] \n", |
766 |
- t2p->pdf_labrange[0], |
767 |
- t2p->pdf_labrange[1], |
768 |
- t2p->pdf_labrange[2], |
769 |
-@@ -4759,26 +4741,26 @@ |
770 |
- tsize_t t2p_write_pdf_transfer(T2P* t2p, TIFF* output){ |
771 |
- |
772 |
- tsize_t written=0; |
773 |
-- char buffer[16]; |
774 |
-+ char buffer[32]; |
775 |
- int buflen=0; |
776 |
- |
777 |
- written += t2pWriteFile(output, (tdata_t) "<< /Type /ExtGState \n/TR ", 25); |
778 |
- if(t2p->tiff_transferfunctioncount == 1){ |
779 |
-- buflen=sprintf(buffer, "%lu", |
780 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%lu", |
781 |
- (unsigned long)(t2p->pdf_xrefcount + 1)); |
782 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
783 |
- written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); |
784 |
- } else { |
785 |
- written += t2pWriteFile(output, (tdata_t) "[ ", 2); |
786 |
-- buflen=sprintf(buffer, "%lu", |
787 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%lu", |
788 |
- (unsigned long)(t2p->pdf_xrefcount + 1)); |
789 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
790 |
- written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); |
791 |
-- buflen=sprintf(buffer, "%lu", |
792 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%lu", |
793 |
- (unsigned long)(t2p->pdf_xrefcount + 2)); |
794 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
795 |
- written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); |
796 |
-- buflen=sprintf(buffer, "%lu", |
797 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%lu", |
798 |
- (unsigned long)(t2p->pdf_xrefcount + 3)); |
799 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
800 |
- written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); |
801 |
-@@ -4800,7 +4782,7 @@ |
802 |
- written += t2pWriteFile(output, (tdata_t) "/FunctionType 0 \n", 17); |
803 |
- written += t2pWriteFile(output, (tdata_t) "/Domain [0.0 1.0] \n", 19); |
804 |
- written += t2pWriteFile(output, (tdata_t) "/Range [0.0 1.0] \n", 18); |
805 |
-- buflen=sprintf(buffer, "/Size [%u] \n", (1<<t2p->tiff_bitspersample)); |
806 |
-+ buflen=snprintf(buffer, sizeof(buffer), "/Size [%u] \n", (1<<t2p->tiff_bitspersample)); |
807 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
808 |
- written += t2pWriteFile(output, (tdata_t) "/BitsPerSample 16 \n", 19); |
809 |
- written += t2p_write_pdf_stream_dict(((tsize_t)1)<<(t2p->tiff_bitspersample+1), 0, output); |
810 |
-@@ -4827,7 +4809,7 @@ |
811 |
- tsize_t t2p_write_pdf_xobject_calcs(T2P* t2p, TIFF* output){ |
812 |
- |
813 |
- tsize_t written=0; |
814 |
-- char buffer[128]; |
815 |
-+ char buffer[256]; |
816 |
- int buflen=0; |
817 |
- |
818 |
- float X_W=0.0; |
819 |
-@@ -4895,16 +4877,16 @@ |
820 |
- written += t2pWriteFile(output, (tdata_t) "<< \n", 4); |
821 |
- if(t2p->pdf_colorspace & T2P_CS_CALGRAY){ |
822 |
- written += t2pWriteFile(output, (tdata_t) "/WhitePoint ", 12); |
823 |
-- buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); |
824 |
-+ buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); |
825 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
826 |
- written += t2pWriteFile(output, (tdata_t) "/Gamma 2.2 \n", 12); |
827 |
- } |
828 |
- if(t2p->pdf_colorspace & T2P_CS_CALRGB){ |
829 |
- written += t2pWriteFile(output, (tdata_t) "/WhitePoint ", 12); |
830 |
-- buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); |
831 |
-+ buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); |
832 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
833 |
- written += t2pWriteFile(output, (tdata_t) "/Matrix ", 8); |
834 |
-- buflen=sprintf(buffer, "[%.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f] \n", |
835 |
-+ buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f] \n", |
836 |
- X_R, Y_R, Z_R, |
837 |
- X_G, Y_G, Z_G, |
838 |
- X_B, Y_B, Z_B); |
839 |
-@@ -4923,11 +4905,11 @@ |
840 |
- tsize_t t2p_write_pdf_xobject_icccs(T2P* t2p, TIFF* output){ |
841 |
- |
842 |
- tsize_t written=0; |
843 |
-- char buffer[16]; |
844 |
-+ char buffer[32]; |
845 |
- int buflen=0; |
846 |
- |
847 |
- written += t2pWriteFile(output, (tdata_t) "[/ICCBased ", 11); |
848 |
-- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_icccs); |
849 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_icccs); |
850 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
851 |
- written += t2pWriteFile(output, (tdata_t) " 0 R] \n", 7); |
852 |
- |
853 |
-@@ -4937,11 +4919,11 @@ |
854 |
- tsize_t t2p_write_pdf_xobject_icccs_dict(T2P* t2p, TIFF* output){ |
855 |
- |
856 |
- tsize_t written=0; |
857 |
-- char buffer[16]; |
858 |
-+ char buffer[32]; |
859 |
- int buflen=0; |
860 |
- |
861 |
- written += t2pWriteFile(output, (tdata_t) "/N ", 3); |
862 |
-- buflen=sprintf(buffer, "%u \n", t2p->tiff_samplesperpixel); |
863 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%u \n", t2p->tiff_samplesperpixel); |
864 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
865 |
- written += t2pWriteFile(output, (tdata_t) "/Alternate ", 11); |
866 |
- t2p->pdf_colorspace ^= T2P_CS_ICCBASED; |
867 |
-@@ -5006,7 +4988,7 @@ |
868 |
- tsize_t t2p_write_pdf_xobject_stream_filter(ttile_t tile, T2P* t2p, TIFF* output){ |
869 |
- |
870 |
- tsize_t written=0; |
871 |
-- char buffer[16]; |
872 |
-+ char buffer[32]; |
873 |
- int buflen=0; |
874 |
- |
875 |
- if(t2p->pdf_compression==T2P_COMPRESS_NONE){ |
876 |
-@@ -5021,41 +5003,33 @@ |
877 |
- written += t2pWriteFile(output, (tdata_t) "<< /K -1 ", 9); |
878 |
- if(tile==0){ |
879 |
- written += t2pWriteFile(output, (tdata_t) "/Columns ", 9); |
880 |
-- buflen=sprintf(buffer, "%lu", |
881 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%lu", |
882 |
- (unsigned long)t2p->tiff_width); |
883 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
884 |
- written += t2pWriteFile(output, (tdata_t) " /Rows ", 7); |
885 |
-- buflen=sprintf(buffer, "%lu", |
886 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%lu", |
887 |
- (unsigned long)t2p->tiff_length); |
888 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
889 |
- } else { |
890 |
- if(t2p_tile_is_right_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)==0){ |
891 |
- written += t2pWriteFile(output, (tdata_t) "/Columns ", 9); |
892 |
-- buflen=sprintf( |
893 |
-- buffer, |
894 |
-- "%lu", |
895 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%lu", |
896 |
- (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth); |
897 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
898 |
- } else { |
899 |
- written += t2pWriteFile(output, (tdata_t) "/Columns ", 9); |
900 |
-- buflen=sprintf( |
901 |
-- buffer, |
902 |
-- "%lu", |
903 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%lu", |
904 |
- (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilewidth); |
905 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
906 |
- } |
907 |
- if(t2p_tile_is_bottom_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)==0){ |
908 |
- written += t2pWriteFile(output, (tdata_t) " /Rows ", 7); |
909 |
-- buflen=sprintf( |
910 |
-- buffer, |
911 |
-- "%lu", |
912 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%lu", |
913 |
- (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength); |
914 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
915 |
- } else { |
916 |
- written += t2pWriteFile(output, (tdata_t) " /Rows ", 7); |
917 |
-- buflen=sprintf( |
918 |
-- buffer, |
919 |
-- "%lu", |
920 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%lu", |
921 |
- (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilelength); |
922 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
923 |
- } |
924 |
-@@ -5082,21 +5056,17 @@ |
925 |
- if(t2p->pdf_compressionquality%100){ |
926 |
- written += t2pWriteFile(output, (tdata_t) "/DecodeParms ", 13); |
927 |
- written += t2pWriteFile(output, (tdata_t) "<< /Predictor ", 14); |
928 |
-- _TIFFmemset(buffer, 0x00, 16); |
929 |
-- buflen=sprintf(buffer, "%u", t2p->pdf_compressionquality%100); |
930 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_compressionquality%100); |
931 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
932 |
- written += t2pWriteFile(output, (tdata_t) " /Columns ", 10); |
933 |
-- _TIFFmemset(buffer, 0x00, 16); |
934 |
-- buflen = sprintf(buffer, "%lu", |
935 |
-+ buflen = snprintf(buffer, sizeof(buffer), "%lu", |
936 |
- (unsigned long)t2p->tiff_width); |
937 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
938 |
- written += t2pWriteFile(output, (tdata_t) " /Colors ", 9); |
939 |
-- _TIFFmemset(buffer, 0x00, 16); |
940 |
-- buflen=sprintf(buffer, "%u", t2p->tiff_samplesperpixel); |
941 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->tiff_samplesperpixel); |
942 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
943 |
- written += t2pWriteFile(output, (tdata_t) " /BitsPerComponent ", 19); |
944 |
-- _TIFFmemset(buffer, 0x00, 16); |
945 |
-- buflen=sprintf(buffer, "%u", t2p->tiff_bitspersample); |
946 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->tiff_bitspersample); |
947 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
948 |
- written += t2pWriteFile(output, (tdata_t) ">>\n", 3); |
949 |
- } |
950 |
-@@ -5116,16 +5086,16 @@ |
951 |
- tsize_t t2p_write_pdf_xreftable(T2P* t2p, TIFF* output){ |
952 |
- |
953 |
- tsize_t written=0; |
954 |
-- char buffer[21]; |
955 |
-+ char buffer[64]; |
956 |
- int buflen=0; |
957 |
- uint32 i=0; |
958 |
- |
959 |
- written += t2pWriteFile(output, (tdata_t) "xref\n0 ", 7); |
960 |
-- buflen=sprintf(buffer, "%lu", (unsigned long)(t2p->pdf_xrefcount + 1)); |
961 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(t2p->pdf_xrefcount + 1)); |
962 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
963 |
- written += t2pWriteFile(output, (tdata_t) " \n0000000000 65535 f \n", 22); |
964 |
- for (i=0;i<t2p->pdf_xrefcount;i++){ |
965 |
-- sprintf(buffer, "%.10lu 00000 n \n", |
966 |
-+ snprintf(buffer, sizeof(buffer), "%.10lu 00000 n \n", |
967 |
- (unsigned long)t2p->pdf_xrefoffsets[i]); |
968 |
- written += t2pWriteFile(output, (tdata_t) buffer, 20); |
969 |
- } |
970 |
-@@ -5149,17 +5119,14 @@ |
971 |
- snprintf(t2p->pdf_fileid + i, 9, "%.8X", rand()); |
972 |
- |
973 |
- written += t2pWriteFile(output, (tdata_t) "trailer\n<<\n/Size ", 17); |
974 |
-- buflen = sprintf(buffer, "%lu", (unsigned long)(t2p->pdf_xrefcount+1)); |
975 |
-+ buflen = snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(t2p->pdf_xrefcount+1)); |
976 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
977 |
-- _TIFFmemset(buffer, 0x00, 32); |
978 |
- written += t2pWriteFile(output, (tdata_t) "\n/Root ", 7); |
979 |
-- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_catalog); |
980 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_catalog); |
981 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
982 |
-- _TIFFmemset(buffer, 0x00, 32); |
983 |
- written += t2pWriteFile(output, (tdata_t) " 0 R \n/Info ", 12); |
984 |
-- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_info); |
985 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_info); |
986 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
987 |
-- _TIFFmemset(buffer, 0x00, 32); |
988 |
- written += t2pWriteFile(output, (tdata_t) " 0 R \n/ID[<", 11); |
989 |
- written += t2pWriteFile(output, (tdata_t) t2p->pdf_fileid, |
990 |
- sizeof(t2p->pdf_fileid) - 1); |
991 |
-@@ -5167,9 +5134,8 @@ |
992 |
- written += t2pWriteFile(output, (tdata_t) t2p->pdf_fileid, |
993 |
- sizeof(t2p->pdf_fileid) - 1); |
994 |
- written += t2pWriteFile(output, (tdata_t) ">]\n>>\nstartxref\n", 16); |
995 |
-- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_startxref); |
996 |
-+ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_startxref); |
997 |
- written += t2pWriteFile(output, (tdata_t) buffer, buflen); |
998 |
-- _TIFFmemset(buffer, 0x00, 32); |
999 |
- written += t2pWriteFile(output, (tdata_t) "\n%%EOF\n", 7); |
1000 |
- |
1001 |
- return(written); |
1002 |
-diff -Naur tiff-4.0.3.orig/tools/tiff2ps.c tiff-4.0.3/tools/tiff2ps.c |
1003 |
---- tiff-4.0.3.orig/tools/tiff2ps.c 2011-05-31 13:10:18.000000000 -0400 |
1004 |
-+++ tiff-4.0.3/tools/tiff2ps.c 2013-05-02 12:02:42.789287990 -0400 |
1005 |
-@@ -1781,8 +1781,8 @@ |
1006 |
- imageOp = "imagemask"; |
1007 |
- |
1008 |
- (void)strcpy(im_x, "0"); |
1009 |
-- (void)sprintf(im_y, "%lu", (long) h); |
1010 |
-- (void)sprintf(im_h, "%lu", (long) h); |
1011 |
-+ (void)snprintf(im_y, sizeof(im_y), "%lu", (long) h); |
1012 |
-+ (void)snprintf(im_h, sizeof(im_h), "%lu", (long) h); |
1013 |
- tile_width = w; |
1014 |
- tile_height = h; |
1015 |
- if (TIFFIsTiled(tif)) { |
1016 |
-@@ -1803,7 +1803,7 @@ |
1017 |
- } |
1018 |
- if (tile_height < h) { |
1019 |
- fputs("/im_y 0 def\n", fd); |
1020 |
-- (void)sprintf(im_y, "%lu im_y sub", (unsigned long) h); |
1021 |
-+ (void)snprintf(im_y, sizeof(im_y), "%lu im_y sub", (unsigned long) h); |
1022 |
- } |
1023 |
- } else { |
1024 |
- repeat_count = tf_numberstrips; |
1025 |
-@@ -1815,7 +1815,7 @@ |
1026 |
- fprintf(fd, "/im_h %lu def\n", |
1027 |
- (unsigned long) tile_height); |
1028 |
- (void)strcpy(im_h, "im_h"); |
1029 |
-- (void)sprintf(im_y, "%lu im_y sub", (unsigned long) h); |
1030 |
-+ (void)snprintf(im_y, sizeof(im_y), "%lu im_y sub", (unsigned long) h); |
1031 |
- } |
1032 |
- } |
1033 |
- |
1034 |
-diff -Naur tiff-4.0.3.orig/tools/tiffcrop.c tiff-4.0.3/tools/tiffcrop.c |
1035 |
---- tiff-4.0.3.orig/tools/tiffcrop.c 2010-12-14 09:18:28.000000000 -0500 |
1036 |
-+++ tiff-4.0.3/tools/tiffcrop.c 2013-05-02 12:02:42.791288005 -0400 |
1037 |
-@@ -2077,7 +2077,7 @@ |
1038 |
- return 1; |
1039 |
- } |
1040 |
- |
1041 |
-- sprintf (filenum, "-%03d%s", findex, export_ext); |
1042 |
-+ snprintf(filenum, sizeof(filenum), "-%03d%s", findex, export_ext); |
1043 |
- filenum[14] = '\0'; |
1044 |
- strncat (exportname, filenum, 15); |
1045 |
- } |
1046 |
-@@ -2230,8 +2230,8 @@ |
1047 |
- |
1048 |
- /* dump.infilename is guaranteed to be NUL termimated and have 20 bytes |
1049 |
- fewer than PATH_MAX */ |
1050 |
-- memset (temp_filename, '\0', PATH_MAX + 1); |
1051 |
-- sprintf (temp_filename, "%s-read-%03d.%s", dump.infilename, dump_images, |
1052 |
-+ snprintf(temp_filename, sizeof(temp_filename), "%s-read-%03d.%s", |
1053 |
-+ dump.infilename, dump_images, |
1054 |
- (dump.format == DUMP_TEXT) ? "txt" : "raw"); |
1055 |
- if ((dump.infile = fopen(temp_filename, dump.mode)) == NULL) |
1056 |
- { |
1057 |
-@@ -2249,8 +2249,8 @@ |
1058 |
- |
1059 |
- /* dump.outfilename is guaranteed to be NUL termimated and have 20 bytes |
1060 |
- fewer than PATH_MAX */ |
1061 |
-- memset (temp_filename, '\0', PATH_MAX + 1); |
1062 |
-- sprintf (temp_filename, "%s-write-%03d.%s", dump.outfilename, dump_images, |
1063 |
-+ snprintf(temp_filename, sizeof(temp_filename), "%s-write-%03d.%s", |
1064 |
-+ dump.outfilename, dump_images, |
1065 |
- (dump.format == DUMP_TEXT) ? "txt" : "raw"); |
1066 |
- if ((dump.outfile = fopen(temp_filename, dump.mode)) == NULL) |
1067 |
- { |
1068 |
-diff -Naur tiff-4.0.3.orig/tools/tiffdither.c tiff-4.0.3/tools/tiffdither.c |
1069 |
---- tiff-4.0.3.orig/tools/tiffdither.c 2010-03-10 13:56:50.000000000 -0500 |
1070 |
-+++ tiff-4.0.3/tools/tiffdither.c 2013-05-02 12:02:42.792288013 -0400 |
1071 |
-@@ -260,7 +260,7 @@ |
1072 |
- TIFFSetField(out, TIFFTAG_FILLORDER, fillorder); |
1073 |
- else |
1074 |
- CopyField(TIFFTAG_FILLORDER, shortv); |
1075 |
-- sprintf(thing, "Dithered B&W version of %s", argv[optind]); |
1076 |
-+ snprintf(thing, sizeof(thing), "Dithered B&W version of %s", argv[optind]); |
1077 |
- TIFFSetField(out, TIFFTAG_IMAGEDESCRIPTION, thing); |
1078 |
- CopyField(TIFFTAG_PHOTOMETRIC, shortv); |
1079 |
- CopyField(TIFFTAG_ORIENTATION, shortv); |
1080 |
|
1081 |
diff --git a/media-libs/tiff/files/tiff-4.0.3-CVE-2013-4231.patch b/media-libs/tiff/files/tiff-4.0.3-CVE-2013-4231.patch |
1082 |
deleted file mode 100644 |
1083 |
index c4b3446..00000000 |
1084 |
--- a/media-libs/tiff/files/tiff-4.0.3-CVE-2013-4231.patch |
1085 |
+++ /dev/null |
1086 |
@@ -1,16 +0,0 @@ |
1087 |
-http://pkgs.fedoraproject.org/cgit/libtiff.git/plain/libtiff-CVE-2013-4231.patch |
1088 |
-http://bugs.gentoo.org/480466 |
1089 |
- |
1090 |
---- tools/gif2tiff.c |
1091 |
-+++ tools/gif2tiff.c |
1092 |
-@@ -333,6 +333,10 @@ readraster(void) |
1093 |
- int status = 1; |
1094 |
- |
1095 |
- datasize = getc(infile); |
1096 |
-+ |
1097 |
-+ if (datasize > 12) |
1098 |
-+ return 0; |
1099 |
-+ |
1100 |
- clear = 1 << datasize; |
1101 |
- eoi = clear + 1; |
1102 |
- avail = clear + 2; |
1103 |
|
1104 |
diff --git a/media-libs/tiff/files/tiff-4.0.3-CVE-2013-4232.patch b/media-libs/tiff/files/tiff-4.0.3-CVE-2013-4232.patch |
1105 |
deleted file mode 100644 |
1106 |
index 98edff5..00000000 |
1107 |
--- a/media-libs/tiff/files/tiff-4.0.3-CVE-2013-4232.patch |
1108 |
+++ /dev/null |
1109 |
@@ -1,13 +0,0 @@ |
1110 |
-http://pkgs.fedoraproject.org/cgit/libtiff.git/plain/libtiff-CVE-2013-4232.patch |
1111 |
-http://bugs.gentoo.org/480466 |
1112 |
- |
1113 |
---- tools/tiff2pdf.c |
1114 |
-+++ tools/tiff2pdf.c |
1115 |
-@@ -2462,6 +2462,7 @@ tsize_t t2p_readwrite_pdf_image(T2P* t2p, TIFF* input, TIFF* output){ |
1116 |
- TIFFFileName(input)); |
1117 |
- t2p->t2p_error = T2P_ERR_ERROR; |
1118 |
- _TIFFfree(buffer); |
1119 |
-+ return(0); |
1120 |
- } else { |
1121 |
- buffer=samplebuffer; |
1122 |
- t2p->tiff_datasize *= t2p->tiff_samplesperpixel; |
1123 |
|
1124 |
diff --git a/media-libs/tiff/files/tiff-4.0.3-CVE-2013-4244.patch b/media-libs/tiff/files/tiff-4.0.3-CVE-2013-4244.patch |
1125 |
deleted file mode 100644 |
1126 |
index 792e076..00000000 |
1127 |
--- a/media-libs/tiff/files/tiff-4.0.3-CVE-2013-4244.patch |
1128 |
+++ /dev/null |
1129 |
@@ -1,15 +0,0 @@ |
1130 |
-diff --git a/tools/gif2tiff.c b/tools/gif2tiff.c |
1131 |
-index 375b152..2731273 100644 |
1132 |
---- a/tools/gif2tiff.c |
1133 |
-+++ b/tools/gif2tiff.c |
1134 |
-@@ -402,6 +402,10 @@ process(register int code, unsigned char** fill) |
1135 |
- } |
1136 |
- |
1137 |
- if (oldcode == -1) { |
1138 |
-+ if (code >= clear) { |
1139 |
-+ fprintf(stderr, "bad input: code=%d is larger than clear=%d\n",code, clear); |
1140 |
-+ return 0; |
1141 |
-+ } |
1142 |
- *(*fill)++ = suffix[code]; |
1143 |
- firstchar = oldcode = code; |
1144 |
- return 1; |
1145 |
|
1146 |
diff --git a/media-libs/tiff/files/tiff-4.0.3-libjpeg-turbo.patch b/media-libs/tiff/files/tiff-4.0.3-libjpeg-turbo.patch |
1147 |
deleted file mode 100644 |
1148 |
index 92cff7e..00000000 |
1149 |
--- a/media-libs/tiff/files/tiff-4.0.3-libjpeg-turbo.patch |
1150 |
+++ /dev/null |
1151 |
@@ -1,122 +0,0 @@ |
1152 |
-Back-port upstream patch to avoid assuming quite so much about what libjpeg |
1153 |
-will return. Needed because libjpeg-turbo with the jpeg8 API broke the |
1154 |
-expectations of the previous coding. |
1155 |
- |
1156 |
- |
1157 |
-diff -Naur tiff-4.0.3.orig/test/raw_decode.c tiff-4.0.3/test/raw_decode.c |
1158 |
---- tiff-4.0.3.orig/test/raw_decode.c 2012-07-06 13:05:16.000000000 -0400 |
1159 |
-+++ tiff-4.0.3/test/raw_decode.c 2012-12-19 13:04:37.609738276 -0500 |
1160 |
-@@ -71,33 +71,54 @@ |
1161 |
- return 1; |
1162 |
- } |
1163 |
- |
1164 |
--static int check_rgb_pixel( int pixel, int red, int green, int blue, unsigned char *buffer ) { |
1165 |
-+static int check_rgb_pixel( int pixel, |
1166 |
-+ int min_red, int max_red, |
1167 |
-+ int min_green, int max_green, |
1168 |
-+ int min_blue, int max_blue, |
1169 |
-+ unsigned char *buffer ) { |
1170 |
- unsigned char *rgb = buffer + 3 * pixel; |
1171 |
- |
1172 |
-- if( rgb[0] == red && rgb[1] == green && rgb[2] == blue ) { |
1173 |
-+ if( rgb[0] >= min_red && rgb[0] <= max_red && |
1174 |
-+ rgb[1] >= min_green && rgb[1] <= max_green && |
1175 |
-+ rgb[2] >= min_blue && rgb[2] <= max_blue ) { |
1176 |
- return 0; |
1177 |
- } |
1178 |
- |
1179 |
- fprintf( stderr, "Pixel %d did not match expected results.\n", pixel ); |
1180 |
-- fprintf( stderr, "Expect: %3d %3d %3d\n", red, green, blue ); |
1181 |
-- fprintf( stderr, " Got: %3d %3d %3d\n", rgb[0], rgb[1], rgb[2] ); |
1182 |
-+ fprintf( stderr, "Got R=%d (expected %d..%d), G=%d (expected %d..%d), B=%d (expected %d..%d)\n", |
1183 |
-+ rgb[0], min_red, max_red, |
1184 |
-+ rgb[1], min_green, max_green, |
1185 |
-+ rgb[2], min_blue, max_blue ); |
1186 |
- return 1; |
1187 |
- } |
1188 |
- |
1189 |
--static int check_rgba_pixel( int pixel, int red, int green, int blue, int alpha, uint32 *buffer ) { |
1190 |
-+static int check_rgba_pixel( int pixel, |
1191 |
-+ int min_red, int max_red, |
1192 |
-+ int min_green, int max_green, |
1193 |
-+ int min_blue, int max_blue, |
1194 |
-+ int min_alpha, int max_alpha, |
1195 |
-+ uint32 *buffer ) { |
1196 |
- /* RGBA images are upside down - adjust for normal ordering */ |
1197 |
- int adjusted_pixel = pixel % 128 + (127 - (pixel/128)) * 128; |
1198 |
- uint32 rgba = buffer[adjusted_pixel]; |
1199 |
- |
1200 |
-- if( TIFFGetR(rgba) == (uint32) red && TIFFGetG(rgba) == (uint32) green && |
1201 |
-- TIFFGetB(rgba) == (uint32) blue && TIFFGetA(rgba) == (uint32) alpha ) { |
1202 |
-+ if( TIFFGetR(rgba) >= (uint32) min_red && |
1203 |
-+ TIFFGetR(rgba) <= (uint32) max_red && |
1204 |
-+ TIFFGetG(rgba) >= (uint32) min_green && |
1205 |
-+ TIFFGetG(rgba) <= (uint32) max_green && |
1206 |
-+ TIFFGetB(rgba) >= (uint32) min_blue && |
1207 |
-+ TIFFGetB(rgba) <= (uint32) max_blue && |
1208 |
-+ TIFFGetA(rgba) >= (uint32) min_alpha && |
1209 |
-+ TIFFGetA(rgba) <= (uint32) max_alpha ) { |
1210 |
- return 0; |
1211 |
- } |
1212 |
- |
1213 |
- fprintf( stderr, "Pixel %d did not match expected results.\n", pixel ); |
1214 |
-- fprintf( stderr, "Expect: %3d %3d %3d %3d\n", red, green, blue, alpha ); |
1215 |
-- fprintf( stderr, " Got: %3d %3d %3d %3d\n", |
1216 |
-- TIFFGetR(rgba), TIFFGetG(rgba), TIFFGetB(rgba), TIFFGetA(rgba) ); |
1217 |
-+ fprintf( stderr, "Got R=%d (expected %d..%d), G=%d (expected %d..%d), B=%d (expected %d..%d), A=%d (expected %d..%d)\n", |
1218 |
-+ TIFFGetR(rgba), min_red, max_red, |
1219 |
-+ TIFFGetG(rgba), min_green, max_green, |
1220 |
-+ TIFFGetB(rgba), min_blue, max_blue, |
1221 |
-+ TIFFGetA(rgba), min_alpha, max_alpha ); |
1222 |
- return 1; |
1223 |
- } |
1224 |
- |
1225 |
-@@ -191,15 +212,17 @@ |
1226 |
- return 1; |
1227 |
- } |
1228 |
- |
1229 |
--#if JPEG_LIB_VERSION >= 70 |
1230 |
-- pixel_status |= check_rgb_pixel( 0, 18, 0, 41, buffer ); |
1231 |
-- pixel_status |= check_rgb_pixel( 64, 0, 0, 0, buffer ); |
1232 |
-- pixel_status |= check_rgb_pixel( 512, 5, 34, 196, buffer ); |
1233 |
--#else |
1234 |
-- pixel_status |= check_rgb_pixel( 0, 15, 0, 18, buffer ); |
1235 |
-- pixel_status |= check_rgb_pixel( 64, 0, 0, 2, buffer ); |
1236 |
-- pixel_status |= check_rgb_pixel( 512, 6, 36, 182, buffer ); |
1237 |
--#endif |
1238 |
-+ /* |
1239 |
-+ * JPEG decoding is inherently inexact, so we can't test for exact |
1240 |
-+ * pixel values. (Well, if we knew exactly which libjpeg version |
1241 |
-+ * we were using, and with what settings, we could expect specific |
1242 |
-+ * values ... but it's not worth the trouble to keep track of.) |
1243 |
-+ * Hence, use ranges of expected values. The ranges may need to be |
1244 |
-+ * widened over time as more versions of libjpeg appear. |
1245 |
-+ */ |
1246 |
-+ pixel_status |= check_rgb_pixel( 0, 15, 18, 0, 0, 18, 41, buffer ); |
1247 |
-+ pixel_status |= check_rgb_pixel( 64, 0, 0, 0, 0, 0, 2, buffer ); |
1248 |
-+ pixel_status |= check_rgb_pixel( 512, 5, 6, 34, 36, 182, 196, buffer ); |
1249 |
- |
1250 |
- free( buffer ); |
1251 |
- |
1252 |
-@@ -224,15 +247,12 @@ |
1253 |
- * accomplish it from the YCbCr subsampled buffer ourselves in which |
1254 |
- * case the results may be subtly different but similar. |
1255 |
- */ |
1256 |
--#if JPEG_LIB_VERSION >= 70 |
1257 |
-- pixel_status |= check_rgba_pixel( 0, 18, 0, 41, 255, rgba_buffer ); |
1258 |
-- pixel_status |= check_rgba_pixel( 64, 0, 0, 0, 255, rgba_buffer ); |
1259 |
-- pixel_status |= check_rgba_pixel( 512, 5, 34, 196, 255, rgba_buffer ); |
1260 |
--#else |
1261 |
-- pixel_status |= check_rgba_pixel( 0, 15, 0, 18, 255, rgba_buffer ); |
1262 |
-- pixel_status |= check_rgba_pixel( 64, 0, 0, 2, 255, rgba_buffer ); |
1263 |
-- pixel_status |= check_rgba_pixel( 512, 6, 36, 182, 255, rgba_buffer ); |
1264 |
--#endif |
1265 |
-+ pixel_status |= check_rgba_pixel( 0, 15, 18, 0, 0, 18, 41, 255, 255, |
1266 |
-+ rgba_buffer ); |
1267 |
-+ pixel_status |= check_rgba_pixel( 64, 0, 0, 0, 0, 0, 2, 255, 255, |
1268 |
-+ rgba_buffer ); |
1269 |
-+ pixel_status |= check_rgba_pixel( 512, 5, 6, 34, 36, 182, 196, 255, 255, |
1270 |
-+ rgba_buffer ); |
1271 |
- |
1272 |
- free( rgba_buffer ); |
1273 |
- TIFFClose(tif); |
1274 |
|
1275 |
diff --git a/media-libs/tiff/files/tiff-4.0.3-tiff2pdf-colors.patch b/media-libs/tiff/files/tiff-4.0.3-tiff2pdf-colors.patch |
1276 |
deleted file mode 100644 |
1277 |
index a503444..00000000 |
1278 |
--- a/media-libs/tiff/files/tiff-4.0.3-tiff2pdf-colors.patch |
1279 |
+++ /dev/null |
1280 |
@@ -1,15 +0,0 @@ |
1281 |
-http://bugs.gentoo.org/145055 |
1282 |
- |
1283 |
-http://build.opensuse.org/package/view_file?file=tiff-4.0.2-tiff2pdf-colors.patch&package=tiff&project=openSUSE%3AFactory |
1284 |
- |
1285 |
---- tools/tiff2pdf.c |
1286 |
-+++ tools/tiff2pdf.c |
1287 |
-@@ -4991,7 +4991,7 @@ |
1288 |
- |
1289 |
- if(t2p->tiff_photometric != PHOTOMETRIC_YCBCR) { |
1290 |
- written += t2pWriteFile(output, (tdata_t) "/DecodeParms ", 13); |
1291 |
-- written += t2pWriteFile(output, (tdata_t) "<< /ColorTransform 0 >>\n", 24); |
1292 |
-+ written += t2pWriteFile(output, (tdata_t) "<< /ColorTransform 1 >>\n", 24); |
1293 |
- } |
1294 |
- break; |
1295 |
- #endif |