28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
From 7b91458541769f3d7eddc55a39d01730af2489fc Mon Sep 17 00:00:00 2001
|
|
From: Even Rouault <even.rouault@spatialys.com>
|
|
Date: Sat, 5 Feb 2022 20:36:41 +0100
|
|
Subject: [PATCH] TIFFReadDirectory(): avoid calling memcpy() with a null
|
|
source pointer and size of zero (fixes #362)
|
|
|
|
Upstream-Status: Backport
|
|
CVE: CVE-2022-0562
|
|
|
|
---
|
|
libtiff/tif_dirread.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
|
|
index d84147a..ae52ad4 100644
|
|
--- a/libtiff/tif_dirread.c
|
|
+++ b/libtiff/tif_dirread.c
|
|
@@ -4173,7 +4173,8 @@ TIFFReadDirectory(TIFF* tif)
|
|
goto bad;
|
|
}
|
|
|
|
- memcpy(new_sampleinfo, tif->tif_dir.td_sampleinfo, old_extrasamples * sizeof(uint16_t));
|
|
+ if (old_extrasamples > 0)
|
|
+ memcpy(new_sampleinfo, tif->tif_dir.td_sampleinfo, old_extrasamples * sizeof(uint16_t));
|
|
_TIFFsetShortArray(&tif->tif_dir.td_sampleinfo, new_sampleinfo, tif->tif_dir.td_extrasamples);
|
|
_TIFFfree(new_sampleinfo);
|
|
}
|