Blame SOURCES/0022-CVE-2022-0562-TIFFReadDirectory-avoid-calling-memcpy.patch
|
 |
ccba1e |
From b7426cc131d837de8d139b8007f66f9db59c4f6a Mon Sep 17 00:00:00 2001
|
|
|
ccba1e |
From: Even Rouault <even.rouault@spatialys.com>
|
|
|
ccba1e |
Date: Sat, 5 Feb 2022 20:36:41 +0100
|
|
|
ccba1e |
Subject: [PATCH] (CVE-2022-0562) TIFFReadDirectory(): avoid calling memcpy()
|
|
|
ccba1e |
with a null source pointer and size of zero (fixes #362)
|
|
|
ccba1e |
|
|
|
ccba1e |
(cherry picked from commit 561599c99f987dc32ae110370cfdd7df7975586b)
|
|
|
ccba1e |
---
|
|
|
ccba1e |
libtiff/tif_dirread.c | 3 ++-
|
|
|
ccba1e |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
ccba1e |
|
|
|
ccba1e |
diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
|
|
|
ccba1e |
index 1e6f1c2f..d68aecc5 100644
|
|
|
ccba1e |
--- a/libtiff/tif_dirread.c
|
|
|
ccba1e |
+++ b/libtiff/tif_dirread.c
|
|
|
ccba1e |
@@ -4083,7 +4083,8 @@ TIFFReadDirectory(TIFF* tif)
|
|
|
ccba1e |
goto bad;
|
|
|
ccba1e |
}
|
|
|
ccba1e |
|
|
|
ccba1e |
- memcpy(new_sampleinfo, tif->tif_dir.td_sampleinfo, old_extrasamples * sizeof(uint16));
|
|
|
ccba1e |
+ if (old_extrasamples > 0)
|
|
|
ccba1e |
+ memcpy(new_sampleinfo, tif->tif_dir.td_sampleinfo, old_extrasamples * sizeof(uint16));
|
|
|
ccba1e |
_TIFFsetShortArray(&tif->tif_dir.td_sampleinfo, new_sampleinfo, tif->tif_dir.td_extrasamples);
|
|
|
ccba1e |
_TIFFfree(new_sampleinfo);
|
|
|
ccba1e |
}
|