aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2017-11-23 07:40:41 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2017-11-23 07:40:41 +0000
commitc3ffef0e8fdbf281e019ab997b2323426d235e1c (patch)
tree1373deb102dfc5ddd88e5f6f2a49140db6e00efb
parent7d45d7b1c971ff25b3ead1ae602cec6f0e967a4b (diff)
downloadalpine_aports-c3ffef0e8fdbf281e019ab997b2323426d235e1c.tar.bz2
alpine_aports-c3ffef0e8fdbf281e019ab997b2323426d235e1c.tar.xz
alpine_aports-c3ffef0e8fdbf281e019ab997b2323426d235e1c.zip
main/tiff: remove unused patches
Diffstat
-rw-r--r--main/tiff/CVE-2017-10688.patch52
-rw-r--r--main/tiff/CVE-2017-9936.patch12
2 files changed, 0 insertions, 64 deletions
diff --git a/main/tiff/CVE-2017-10688.patch b/main/tiff/CVE-2017-10688.patch
deleted file mode 100644
index 846bf48ecf..0000000000
--- a/main/tiff/CVE-2017-10688.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c
2index 2967da58..8d6686ba 100644
3--- a/libtiff/tif_dirwrite.c
4+++ b/libtiff/tif_dirwrite.c
5@@ -2111,7 +2111,10 @@ TIFFWriteDirectoryTagCheckedLong8(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, ui
6 {
7 uint64 m;
8 assert(sizeof(uint64)==8);
9- assert(tif->tif_flags&TIFF_BIGTIFF);
10+ if( !(tif->tif_flags&TIFF_BIGTIFF) ) {
11+ TIFFErrorExt(tif->tif_clientdata,"TIFFWriteDirectoryTagCheckedLong8","LONG8 not allowed for ClassicTIFF");
12+ return(0);
13+ }
14 m=value;
15 if (tif->tif_flags&TIFF_SWAB)
16 TIFFSwabLong8(&m);
17@@ -2124,7 +2127,10 @@ TIFFWriteDirectoryTagCheckedLong8Array(TIFF* tif, uint32* ndir, TIFFDirEntry* di
18 {
19 assert(count<0x20000000);
20 assert(sizeof(uint64)==8);
21- assert(tif->tif_flags&TIFF_BIGTIFF);
22+ if( !(tif->tif_flags&TIFF_BIGTIFF) ) {
23+ TIFFErrorExt(tif->tif_clientdata,"TIFFWriteDirectoryTagCheckedLong8","LONG8 not allowed for ClassicTIFF");
24+ return(0);
25+ }
26 if (tif->tif_flags&TIFF_SWAB)
27 TIFFSwabArrayOfLong8(value,count);
28 return(TIFFWriteDirectoryTagData(tif,ndir,dir,tag,TIFF_LONG8,count,count*8,value));
29@@ -2136,7 +2142,10 @@ TIFFWriteDirectoryTagCheckedSlong8(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, u
30 {
31 int64 m;
32 assert(sizeof(int64)==8);
33- assert(tif->tif_flags&TIFF_BIGTIFF);
34+ if( !(tif->tif_flags&TIFF_BIGTIFF) ) {
35+ TIFFErrorExt(tif->tif_clientdata,"TIFFWriteDirectoryTagCheckedLong8","SLONG8 not allowed for ClassicTIFF");
36+ return(0);
37+ }
38 m=value;
39 if (tif->tif_flags&TIFF_SWAB)
40 TIFFSwabLong8((uint64*)(&m));
41@@ -2149,7 +2158,10 @@ TIFFWriteDirectoryTagCheckedSlong8Array(TIFF* tif, uint32* ndir, TIFFDirEntry* d
42 {
43 assert(count<0x20000000);
44 assert(sizeof(int64)==8);
45- assert(tif->tif_flags&TIFF_BIGTIFF);
46+ if( !(tif->tif_flags&TIFF_BIGTIFF) ) {
47+ TIFFErrorExt(tif->tif_clientdata,"TIFFWriteDirectoryTagCheckedLong8","SLONG8 not allowed for ClassicTIFF");
48+ return(0);
49+ }
50 if (tif->tif_flags&TIFF_SWAB)
51 TIFFSwabArrayOfLong8((uint64*)value,count);
52 return(TIFFWriteDirectoryTagData(tif,ndir,dir,tag,TIFF_SLONG8,count,count*8,value));
diff --git a/main/tiff/CVE-2017-9936.patch b/main/tiff/CVE-2017-9936.patch
deleted file mode 100644
index bbf920f698..0000000000
--- a/main/tiff/CVE-2017-9936.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1diff --git a/libtiff/tif_jbig.c b/libtiff/tif_jbig.c
2index 5f5f75e2..c75f31d9 100644
3--- a/libtiff/tif_jbig.c
4+++ b/libtiff/tif_jbig.c
5@@ -94,6 +94,7 @@ static int JBIGDecode(TIFF* tif, uint8* buffer, tmsize_t size, uint16 s)
6 jbg_strerror(decodeStatus)
7 #endif
8 );
9+ jbg_dec_free(&decoder);
10 return 0;
11 }
12
© 2015 Mike Crute