summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/libtiff/tiff/CVE-2022-1354.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-multimedia/libtiff/tiff/CVE-2022-1354.patch')
-rw-r--r--meta/recipes-multimedia/libtiff/tiff/CVE-2022-1354.patch8
1 files changed, 3 insertions, 5 deletions
diff --git a/meta/recipes-multimedia/libtiff/tiff/CVE-2022-1354.patch b/meta/recipes-multimedia/libtiff/tiff/CVE-2022-1354.patch
index 71b85cac10..989ccbfa50 100644
--- a/meta/recipes-multimedia/libtiff/tiff/CVE-2022-1354.patch
+++ b/meta/recipes-multimedia/libtiff/tiff/CVE-2022-1354.patch
@@ -1,4 +1,4 @@
1From 87881e093691a35c60b91cafed058ba2dd5d9807 Mon Sep 17 00:00:00 2001 1From 281fa3cf0e0e8a44b93478c63d90dbfb64359e88 Mon Sep 17 00:00:00 2001
2From: Even Rouault <even.rouault@spatialys.com> 2From: Even Rouault <even.rouault@spatialys.com>
3Date: Sun, 5 Dec 2021 14:37:46 +0100 3Date: Sun, 5 Dec 2021 14:37:46 +0100
4Subject: [PATCH] TIFFReadDirectory: fix OJPEG hack (fixes #319) 4Subject: [PATCH] TIFFReadDirectory: fix OJPEG hack (fixes #319)
@@ -16,12 +16,13 @@ Upstream-Status: Backport
16[https://gitlab.com/libtiff/libtiff/-/commit/87f580f39011109b3bb5f6eca13fac543a542798] 16[https://gitlab.com/libtiff/libtiff/-/commit/87f580f39011109b3bb5f6eca13fac543a542798]
17 17
18Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 18Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
19
19--- 20---
20 libtiff/tif_dirread.c | 162 ++++++++++++++++++++++-------------------- 21 libtiff/tif_dirread.c | 162 ++++++++++++++++++++++--------------------
21 1 file changed, 83 insertions(+), 79 deletions(-) 22 1 file changed, 83 insertions(+), 79 deletions(-)
22 23
23diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c 24diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
24index 8f434ef5..14c031d1 100644 25index a31109a..d7cccbe 100644
25--- a/libtiff/tif_dirread.c 26--- a/libtiff/tif_dirread.c
26+++ b/libtiff/tif_dirread.c 27+++ b/libtiff/tif_dirread.c
27@@ -3794,50 +3794,7 @@ TIFFReadDirectory(TIFF* tif) 28@@ -3794,50 +3794,7 @@ TIFFReadDirectory(TIFF* tif)
@@ -207,6 +208,3 @@ index 8f434ef5..14c031d1 100644
207 /* 208 /*
208 * Make sure all non-color channels are extrasamples. 209 * Make sure all non-color channels are extrasamples.
209 * If it's not the case, define them as such. 210 * If it's not the case, define them as such.
210--
2112.25.1
212