30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From 561599c99f987dc32ae110370cfdd7df7975586b 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)
|
|
|
|
---
|
|
libtiff/tif_dirread.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
|
|
index 627bf48..8a0e951 100644
|
|
--- a/libtiff/tif_dirread.c
|
|
+++ b/libtiff/tif_dirread.c
|
|
@@ -4126,8 +4126,9 @@ TIFFReadDirectory(TIFF* tif)
|
|
goto bad;
|
|
}
|
|
|
|
- memcpy(new_sampleinfo, tif->tif_dir.td_sampleinfo, old_extrasamples * sizeof(uint16));
|
|
- _TIFFsetShortArray(&tif->tif_dir.td_sampleinfo, new_sampleinfo, tif->tif_dir.td_extrasamples);
|
|
+ if (old_extrasamples > 0)
|
|
+ memcpy(new_sampleinfo, tif->tif_dir.td_sampleinfo, old_extrasamples * sizeof(uint16));
|
|
+ _TIFFsetShortArray(&tif->tif_dir.td_sampleinfo, new_sampleinfo, tif->tif_dir.td_extrasamples);
|
|
_TIFFfree(new_sampleinfo);
|
|
}
|
|
|
|
--
|
|
2.27.0
|
|
|