diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-multimedia/libtiff/files/CVE-2017-10688.patch')
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-multimedia/libtiff/files/CVE-2017-10688.patch | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libtiff/files/CVE-2017-10688.patch b/import-layers/yocto-poky/meta/recipes-multimedia/libtiff/files/CVE-2017-10688.patch index ed9c0f50f..b0db96949 100644 --- a/import-layers/yocto-poky/meta/recipes-multimedia/libtiff/files/CVE-2017-10688.patch +++ b/import-layers/yocto-poky/meta/recipes-multimedia/libtiff/files/CVE-2017-10688.patch @@ -18,10 +18,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> libtiff/tif_dirwrite.c | 20 ++++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) -Index: tiff-4.0.7/ChangeLog -=================================================================== ---- tiff-4.0.7.orig/ChangeLog -+++ tiff-4.0.7/ChangeLog +diff --git a/ChangeLog b/ChangeLog +index 0240f0b..42eaeb7 100644 +--- a/ChangeLog ++++ b/ChangeLog @@ -1,3 +1,11 @@ +2017-06-30 Even Rouault <even.rouault at spatialys.com> + @@ -34,11 +34,11 @@ Index: tiff-4.0.7/ChangeLog 2017-06-26 Even Rouault <even.rouault at spatialys.com> * libtiff/tif_jbig.c: fix memory leak in error code path of JBIGDecode() -Index: tiff-4.0.7/libtiff/tif_dirwrite.c -=================================================================== ---- tiff-4.0.7.orig/libtiff/tif_dirwrite.c -+++ tiff-4.0.7/libtiff/tif_dirwrite.c -@@ -2047,7 +2047,10 @@ TIFFWriteDirectoryTagCheckedLong8(TIFF* +diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c +index 2967da5..8d6686b 100644 +--- a/libtiff/tif_dirwrite.c ++++ b/libtiff/tif_dirwrite.c +@@ -2111,7 +2111,10 @@ TIFFWriteDirectoryTagCheckedLong8(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, ui { uint64 m; assert(sizeof(uint64)==8); @@ -50,7 +50,7 @@ Index: tiff-4.0.7/libtiff/tif_dirwrite.c m=value; if (tif->tif_flags&TIFF_SWAB) TIFFSwabLong8(&m); -@@ -2060,7 +2063,10 @@ TIFFWriteDirectoryTagCheckedLong8Array(T +@@ -2124,7 +2127,10 @@ TIFFWriteDirectoryTagCheckedLong8Array(TIFF* tif, uint32* ndir, TIFFDirEntry* di { assert(count<0x20000000); assert(sizeof(uint64)==8); @@ -62,7 +62,7 @@ Index: tiff-4.0.7/libtiff/tif_dirwrite.c if (tif->tif_flags&TIFF_SWAB) TIFFSwabArrayOfLong8(value,count); return(TIFFWriteDirectoryTagData(tif,ndir,dir,tag,TIFF_LONG8,count,count*8,value)); -@@ -2072,7 +2078,10 @@ TIFFWriteDirectoryTagCheckedSlong8(TIFF* +@@ -2136,7 +2142,10 @@ TIFFWriteDirectoryTagCheckedSlong8(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, u { int64 m; assert(sizeof(int64)==8); @@ -74,7 +74,7 @@ Index: tiff-4.0.7/libtiff/tif_dirwrite.c m=value; if (tif->tif_flags&TIFF_SWAB) TIFFSwabLong8((uint64*)(&m)); -@@ -2085,7 +2094,10 @@ TIFFWriteDirectoryTagCheckedSlong8Array( +@@ -2149,7 +2158,10 @@ TIFFWriteDirectoryTagCheckedSlong8Array(TIFF* tif, uint32* ndir, TIFFDirEntry* d { assert(count<0x20000000); assert(sizeof(int64)==8); @@ -86,3 +86,6 @@ Index: tiff-4.0.7/libtiff/tif_dirwrite.c if (tif->tif_flags&TIFF_SWAB) TIFFSwabArrayOfLong8((uint64*)value,count); return(TIFFWriteDirectoryTagData(tif,ndir,dir,tag,TIFF_SLONG8,count,count*8,value)); +-- +2.7.4 + |
