diff options
author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-12-08 14:34:38 +0000 |
---|---|---|
committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-12-08 14:34:38 +0000 |
commit | 0a93eb49020a15fc593adcab4cd51de153bb1e87 (patch) | |
tree | f18ecc0eb87e5a89bb141ae025d3d647dd425438 /user/tiff/CVE-2019-7663.patch | |
parent | cfbbb803ccef00d28892d81f45a7109b4af3ba06 (diff) | |
parent | 5f3f230e52ea2d7069168fbdd4dfdb5c7e6328e8 (diff) | |
download | packages-0a93eb49020a15fc593adcab4cd51de153bb1e87.tar.gz packages-0a93eb49020a15fc593adcab4cd51de153bb1e87.tar.bz2 packages-0a93eb49020a15fc593adcab4cd51de153bb1e87.tar.xz packages-0a93eb49020a15fc593adcab4cd51de153bb1e87.zip |
Merge branch 'bumps.aerdan.20191018' into 'master'
Bumps for packages maintaned by Kiyoshi Aman for 18 Oct 2019
See merge request adelie/packages!369
Diffstat (limited to 'user/tiff/CVE-2019-7663.patch')
-rw-r--r-- | user/tiff/CVE-2019-7663.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/user/tiff/CVE-2019-7663.patch b/user/tiff/CVE-2019-7663.patch deleted file mode 100644 index 8049566c6..000000000 --- a/user/tiff/CVE-2019-7663.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 802d3cbf3043be5dce5317e140ccb1c17a6a2d39 Mon Sep 17 00:00:00 2001 -From: Thomas Bernard <miniupnp@free.fr> -Date: Tue, 29 Jan 2019 11:21:47 +0100 -Subject: [PATCH] TIFFWriteDirectoryTagTransferfunction() : fix NULL - dereferencing - -http://bugzilla.maptools.org/show_bug.cgi?id=2833 - -we must check the pointer is not NULL before memcmp() the memory ---- - libtiff/tif_dirwrite.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c -index c15a28db..ef30c869 100644 ---- a/libtiff/tif_dirwrite.c -+++ b/libtiff/tif_dirwrite.c -@@ -1893,12 +1893,14 @@ TIFFWriteDirectoryTagTransferfunction(TIFF* tif, uint32* ndir, TIFFDirEntry* dir - n=3; - if (n==3) - { -- if (!_TIFFmemcmp(tif->tif_dir.td_transferfunction[0],tif->tif_dir.td_transferfunction[2],m*sizeof(uint16))) -+ if (tif->tif_dir.td_transferfunction[2] == NULL || -+ !_TIFFmemcmp(tif->tif_dir.td_transferfunction[0],tif->tif_dir.td_transferfunction[2],m*sizeof(uint16))) - n=2; - } - if (n==2) - { -- if (!_TIFFmemcmp(tif->tif_dir.td_transferfunction[0],tif->tif_dir.td_transferfunction[1],m*sizeof(uint16))) -+ if (tif->tif_dir.td_transferfunction[1] == NULL || -+ !_TIFFmemcmp(tif->tif_dir.td_transferfunction[0],tif->tif_dir.td_transferfunction[1],m*sizeof(uint16))) - n=1; - } - if (n==0) --- -2.21.0 - |