diff options
Diffstat (limited to 'media-libs/tiff/files/tiff-4.0.7-CVE-2016-10267.patch')
| -rw-r--r-- | media-libs/tiff/files/tiff-4.0.7-CVE-2016-10267.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/media-libs/tiff/files/tiff-4.0.7-CVE-2016-10267.patch b/media-libs/tiff/files/tiff-4.0.7-CVE-2016-10267.patch deleted file mode 100644 index 04d9729ff731..000000000000 --- a/media-libs/tiff/files/tiff-4.0.7-CVE-2016-10267.patch +++ /dev/null @@ -1,53 +0,0 @@ -http://bugzilla.maptools.org/show_bug.cgi?id=2611 - -From bd06f6c97dff0b30de0f80227d782ea448c14b19 Mon Sep 17 00:00:00 2001 -From: Even Rouault <even.rouault@spatialys.com> -Date: Sat, 3 Dec 2016 11:15:18 +0000 -Subject: [PATCH] * libtiff/tif_ojpeg.c: make OJPEGDecode() early exit in case - of failure in OJPEGPreDecode(). This will avoid a divide by zero, and - potential other issues. Reported by Agostino Sarubbo. Fixes - http://bugzilla.maptools.org/show_bug.cgi?id=2611 - ---- - ChangeLog | 7 +++++++ - libtiff/tif_ojpeg.c | 10 +++++++++- - 2 files changed, 16 insertions(+), 1 deletion(-) - -diff --git a/libtiff/tif_ojpeg.c b/libtiff/tif_ojpeg.c -index 30a1812634e0..93839d8f3e11 100644 ---- a/libtiff/tif_ojpeg.c -+++ b/libtiff/tif_ojpeg.c -@@ -244,6 +244,7 @@ typedef enum { - - typedef struct { - TIFF* tif; -+ int decoder_ok; - #ifndef LIBJPEG_ENCAP_EXTERNAL - JMP_BUF exit_jmpbuf; - #endif -@@ -722,6 +723,7 @@ OJPEGPreDecode(TIFF* tif, uint16 s) - } - sp->write_curstrile++; - } -+ sp->decoder_ok = 1; - return(1); - } - -@@ -784,8 +786,14 @@ OJPEGPreDecodeSkipScanlines(TIFF* tif) - static int - OJPEGDecode(TIFF* tif, uint8* buf, tmsize_t cc, uint16 s) - { -+ static const char module[]="OJPEGDecode"; - OJPEGState* sp=(OJPEGState*)tif->tif_data; - (void)s; -+ if( !sp->decoder_ok ) -+ { -+ TIFFErrorExt(tif->tif_clientdata,module,"Cannot decode: decoder not correctly initialized"); -+ return 0; -+ } - if (sp->libjpeg_jpeg_query_style==0) - { - if (OJPEGDecodeRaw(tif,buf,cc)==0) --- -2.12.0 - |